ChangeLogTag:Sat Mar 1 03:41:30 2003 Ossama Othman <ossama@uci.edu>

1 files changed, 29 insertions, 30 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 4bf09e2fcf8..a2bc1a3863f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -30,7 +30,7 @@ TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Attribute;
 }
 
-CORBA_Contained::Description *
+CORBA::Contained::Description *
 TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -39,17 +39,17 @@ TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
   return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_Contained::Description *
+CORBA::Contained::Description *
 TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA_Contained::Description *desc_ptr = 0;
+  CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
-                    CORBA_Contained::Description,
+                    CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  CORBA_Contained::Description_var retval = desc_ptr;
+  CORBA::Contained::Description_var retval = desc_ptr;
 
   retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -94,16 +94,16 @@ TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr
+CORBA::IDLType_ptr
 TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
+  TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
   return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr
+CORBA::IDLType_ptr
 TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -130,17 +130,17 @@ TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     type_path.c_str ()
                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
+  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
 
-  CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in ()
+  CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ()
                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
+  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
 
   return retval._retn ();
 }
 
 void
-TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def
+TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def
                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -151,7 +151,7 @@ TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def
 }
 
 void
-TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def
+TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -210,11 +210,11 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
                                              mode);
 }
 
-CORBA_AttributeDescription
+CORBA::AttributeDescription
 TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA_AttributeDescription ad;
+  CORBA::AttributeDescription ad;
 
   ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
@@ -280,7 +280,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA_ExcDescriptionSeq get_ed_seq (index);
+  CORBA::ExcDescriptionSeq get_ed_seq (index);
   get_ed_seq.length (index);
 
   for (i = 0; i < (CORBA::ULong) index; ++i)
@@ -288,7 +288,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
       ACE_Configuration_Section_Key key;
       key_queue.dequeue_head (key);
 
-      CORBA_ExceptionDescription get_ed;
+      CORBA::ExceptionDescription get_ed;
 
       ACE_TString name;
       this->repo_->config ()->get_string_value (key,
@@ -364,7 +364,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA_ExcDescriptionSeq put_ed_seq (index);
+  CORBA::ExcDescriptionSeq put_ed_seq (index);
   put_ed_seq.length (index);
 
   for (i = 0; i < (CORBA::ULong) index; ++i)
@@ -372,7 +372,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
       ACE_Configuration_Section_Key key;
       key_queue.dequeue_head (key);
 
-      CORBA_ExceptionDescription put_ed;
+      CORBA::ExceptionDescription put_ed;
 
       ACE_TString name;
       this->repo_->config ()->get_string_value (key,
@@ -416,7 +416,7 @@ TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
   return ad;
 }
 
-CORBA_ExceptionDefSeq *
+CORBA::ExceptionDefSeq *
 TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -464,15 +464,15 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   size_t size = path_queue.size ();
 
-  CORBA_ExceptionDefSeq *get_ed_seq = 0;
+  CORBA::ExceptionDefSeq *get_ed_seq = 0;
   ACE_NEW_THROW_EX (get_ed_seq,
-                    CORBA_ExceptionDefSeq (size),
+                    CORBA::ExceptionDefSeq (size),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
   get_ed_seq->length (size);
 
-  CORBA_ExceptionDefSeq_var retval = get_ed_seq;
+  CORBA::ExceptionDefSeq_var retval = get_ed_seq;
 
   for (CORBA::ULong i = 0; i < size; ++i)
     {
@@ -485,7 +485,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
@@ -493,7 +493,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
   return retval._retn ();
 }
 
-CORBA_ExceptionDefSeq *
+CORBA::ExceptionDefSeq *
 TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -541,15 +541,15 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   size_t size = path_queue.size ();
 
-  CORBA_ExceptionDefSeq *put_ed_seq = 0;
+  CORBA::ExceptionDefSeq *put_ed_seq = 0;
   ACE_NEW_THROW_EX (put_ed_seq,
-                    CORBA_ExceptionDefSeq (size),
+                    CORBA::ExceptionDefSeq (size),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
   put_ed_seq->length (size);
 
-  CORBA_ExceptionDefSeq_var retval = put_ed_seq;
+  CORBA::ExceptionDefSeq_var retval = put_ed_seq;
 
   for (CORBA::ULong i = 0; i < size; ++i)
     {
@@ -562,11 +562,10 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
-