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

4 files changed, 57 insertions, 55 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 76206642ff1..e64b46b5282 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -33,6 +33,8 @@ Sat Mar  1 03:41:30 2003  Ossama Othman  <ossama@uci.edu>
 	* orbsvcs/orbsvcs/IFRService/FinderDef_i.h:
 	* orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
 	* orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
+	* orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+	* orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
 	* orbsvcs/orbsvcs/IFRService/IFR_macro.h:
 	* orbsvcs/orbsvcs/IFRService/IRObject_i.h:
 	* orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index b4f275c3398..8a5784f3157 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -20,7 +20,7 @@ TAO_IFR_Server::TAO_IFR_Server (void)
     ior_multicast_ (0),
     config_ (0),
     repo_impl_ (0),
-    repository_ (CORBA_Repository::_nil ())
+    repository_ (CORBA::Repository::_nil ())
 {
 }
 
@@ -62,7 +62,7 @@ TAO_IFR_Server::init_with_orb (int argc,
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" 
+        orb->resolve_initial_references ("RootPOA"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -353,12 +353,12 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable" 
+    this->orb_->resolve_initial_references ("IORTable"
                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in () 
+    IORTable::Table::_narrow (table_object.in ()
                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -375,8 +375,8 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   // Add the repository to the ORB's table of initialized object references.
-  this->orb_->register_initial_reference ("InterfaceRepository", 
-                                          this->repository_ 
+  this->orb_->register_initial_reference ("InterfaceRepository",
+                                          this->repository_
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index b35777650a2..993bb85da33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -39,7 +39,7 @@ class TAO_IFRService_Export TAO_IFR_Server
 public:
   TAO_IFR_Server (void);
   // Default constructor.
- 
+
   int init_with_orb (int argc,
                      ACE_TCHAR *argv [],
                      CORBA::ORB_ptr orb,
@@ -54,7 +54,7 @@ public:
   // Destructor.
 
 protected:
-  
+
   int create_poas (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Two persistent POAs, one using a servant locator.
 
@@ -95,7 +95,7 @@ protected:
   TAO_Repository_i *repo_impl_;
   // The IFR implementation instance.
 
-  CORBA_Repository_ptr repository_;
+  CORBA::Repository_ptr repository_;
   // The Interface Repository object reference.
 
   CORBA::String_var ifr_ior_;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp b/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
index 888c361be35..beeaeea3793 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
@@ -14,40 +14,40 @@ template class ACE_Node<ACE_Configuration_Section_Key>;
 template class ACE_Unbounded_Queue<ACE_Configuration_Section_Key>;
 template class ACE_Unbounded_Queue_Iterator<ACE_Configuration_Section_Key>;
 
-template class POA_CORBA_Repository_tie<TAO_Repository_i>;
+template class POA_CORBA::Repository_tie<TAO_Repository_i>;
 template class POA_IR::ComponentRepository_tie<TAO_ComponentRepository_i>;
-template class POA_CORBA_PrimitiveDef_tie<TAO_PrimitiveDef_i>;
-template class POA_CORBA_StringDef_tie<TAO_StringDef_i>;
-template class POA_CORBA_WstringDef_tie<TAO_WstringDef_i>;
-template class POA_CORBA_SequenceDef_tie<TAO_SequenceDef_i>;
-template class POA_CORBA_ArrayDef_tie<TAO_ArrayDef_i>;
-template class POA_CORBA_FixedDef_tie<TAO_FixedDef_i>;
-template class POA_CORBA_EnumDef_tie<TAO_EnumDef_i>;
-template class POA_CORBA_AliasDef_tie<TAO_AliasDef_i>;
-template class POA_CORBA_NativeDef_tie<TAO_NativeDef_i>;
-template class POA_CORBA_ValueBoxDef_tie<TAO_ValueBoxDef_i>;
-template class POA_CORBA_UnionDef_tie<TAO_UnionDef_i>;
-template class POA_CORBA_StructDef_tie<TAO_StructDef_i>;
+template class POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i>;
+template class POA_CORBA::StringDef_tie<TAO_StringDef_i>;
+template class POA_CORBA::WstringDef_tie<TAO_WstringDef_i>;
+template class POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i>;
+template class POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i>;
+template class POA_CORBA::FixedDef_tie<TAO_FixedDef_i>;
+template class POA_CORBA::EnumDef_tie<TAO_EnumDef_i>;
+template class POA_CORBA::AliasDef_tie<TAO_AliasDef_i>;
+template class POA_CORBA::NativeDef_tie<TAO_NativeDef_i>;
+template class POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i>;
+template class POA_CORBA::UnionDef_tie<TAO_UnionDef_i>;
+template class POA_CORBA::StructDef_tie<TAO_StructDef_i>;
 template class POA_IR::ConsumesDef_tie<TAO_ConsumesDef_i>;
 template class POA_IR::PublishesDef_tie<TAO_PublishesDef_i>;
 template class POA_IR::EmitsDef_tie<TAO_EmitsDef_i>;
 template class POA_IR::PrimaryKeyDef_tie<TAO_PrimaryKeyDef_i>;
 template class POA_IR::ProvidesDef_tie<TAO_ProvidesDef_i>;
 template class POA_IR::UsesDef_tie<TAO_UsesDef_i>;
-template class POA_CORBA_ValueMemberDef_tie<TAO_ValueMemberDef_i>;
+template class POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i>;
 template class POA_IR::FactoryDef_tie<TAO_FactoryDef_i>;
 template class POA_IR::FinderDef_tie<TAO_FinderDef_i>;
-template class POA_CORBA_AttributeDef_tie<TAO_AttributeDef_i>;
-template class POA_CORBA_ConstantDef_tie<TAO_ConstantDef_i>;
+template class POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i>;
+template class POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i>;
 template class POA_IR::ComponentDef_tie<TAO_ComponentDef_i>;
 template class POA_IR::HomeDef_tie<TAO_HomeDef_i>;
-template class POA_CORBA_ValueDef_tie<TAO_ValueDef_i>;
-template class POA_CORBA_ExceptionDef_tie<TAO_ExceptionDef_i>;
-template class POA_CORBA_ModuleDef_tie<TAO_ModuleDef_i>;
-template class POA_CORBA_OperationDef_tie<TAO_OperationDef_i>;
-template class POA_CORBA_InterfaceDef_tie<TAO_InterfaceDef_i>;
-template class POA_CORBA_AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>;
-template class POA_CORBA_LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>;
+template class POA_CORBA::ValueDef_tie<TAO_ValueDef_i>;
+template class POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i>;
+template class POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i>;
+template class POA_CORBA::OperationDef_tie<TAO_OperationDef_i>;
+template class POA_CORBA::InterfaceDef_tie<TAO_InterfaceDef_i>;
+template class POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>;
+template class POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>;
 
 template class auto_ptr<TAO_Repository_i>;
 template class ACE_Auto_Basic_Ptr<TAO_Repository_i>;
@@ -135,40 +135,40 @@ template class ACE_Auto_Basic_Ptr<char>;
 #pragma instantiate ACE_Unbounded_Queue<ACE_Configuration_Section_Key>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Configuration_Section_Key>
 
-#pragma instantiate POA_CORBA_Repository_tie<TAO_Repository_i>
+#pragma instantiate POA_CORBA::Repository_tie<TAO_Repository_i>
 #pragma instantiate POA_IR::ComponentRepository_tie<TAO_ComponentRepository_i>
-#pragma instantiate POA_CORBA_PrimitiveDef_tie<TAO_PrimitiveDef_i>
-#pragma instantiate POA_CORBA_StringDef_tie<TAO_StringDef_i>
-#pragma instantiate POA_CORBA_WstringDef_tie<TAO_WstringDef_i>
-#pragma instantiate POA_CORBA_SequenceDef_tie<TAO_SequenceDef_i>
-#pragma instantiate POA_CORBA_ArrayDef_tie<TAO_ArrayDef_i>
-#pragma instantiate POA_CORBA_FixedDef_tie<TAO_FixedDef_i>
-#pragma instantiate POA_CORBA_EnumDef_tie<TAO_EnumDef_i>
-#pragma instantiate POA_CORBA_AliasDef_tie<TAO_AliasDef_i>
-#pragma instantiate POA_CORBA_NativeDef_tie<TAO_NativeDef_i>
-#pragma instantiate POA_CORBA_ValueBoxDef_tie<TAO_ValueBoxDef_i>
-#pragma instantiate POA_CORBA_UnionDef_tie<TAO_UnionDef_i>
-#pragma instantiate POA_CORBA_StructDef_tie<TAO_StructDef_i>
+#pragma instantiate POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i>
+#pragma instantiate POA_CORBA::StringDef_tie<TAO_StringDef_i>
+#pragma instantiate POA_CORBA::WstringDef_tie<TAO_WstringDef_i>
+#pragma instantiate POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i>
+#pragma instantiate POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i>
+#pragma instantiate POA_CORBA::FixedDef_tie<TAO_FixedDef_i>
+#pragma instantiate POA_CORBA::EnumDef_tie<TAO_EnumDef_i>
+#pragma instantiate POA_CORBA::AliasDef_tie<TAO_AliasDef_i>
+#pragma instantiate POA_CORBA::NativeDef_tie<TAO_NativeDef_i>
+#pragma instantiate POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i>
+#pragma instantiate POA_CORBA::UnionDef_tie<TAO_UnionDef_i>
+#pragma instantiate POA_CORBA::StructDef_tie<TAO_StructDef_i>
 #pragma instantiate POA_IR::ConsumesDef_tie<TAO_ConsumesDef_i>
 #pragma instantiate POA_IR::PublishesDef_tie<TAO_PublishesDef_i>
 #pragma instantiate POA_IR::EmitsDef_tie<TAO_EmitsDef_i>
 #pragma instantiate POA_IR::PrimaryKeyDef_tie<TAO_PrimaryKeyDef_i>
 #pragma instantiate POA_IR::ProvidesDef_tie<TAO_ProvidesDef_i>
 #pragma instantiate POA_IR::UsesDef_tie<TAO_UsesDef_i>
-#pragma instantiate POA_CORBA_ValueMemberDef_tie<TAO_ValueMemberDef_i>
+#pragma instantiate POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i>
 #pragma instantiate POA_IR::FactoryDef_tie<TAO_FactoryDef_i>
 #pragma instantiate POA_IR::FinderDef_tie<TAO_FinderDef_i>
-#pragma instantiate POA_CORBA_AttributeDef_tie<TAO_AttributeDef_i>
-#pragma instantiate POA_CORBA_ConstantDef_tie<TAO_ConstantDef_i>
+#pragma instantiate POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i>
+#pragma instantiate POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i>
 #pragma instantiate POA_IR::ComponentDef_tie<TAO_ComponentDef_i>
 #pragma instantiate POA_IR::HomeDef_tie<TAO_HomeDef_i>
-#pragma instantiate POA_CORBA_ValueDef_tie<TAO_ValueDef_i>
-#pragma instantiate POA_CORBA_ExceptionDef_tie<TAO_ExceptionDef_i>
-#pragma instantiate POA_CORBA_ModuleDef_tie<TAO_ModuleDef_i>
-#pragma instantiate POA_CORBA_OperationDef_tie<TAO_OperationDef_i>
-#pragma instantiate POA_CORBA_InterfaceDef_tie<TAO_>
-#pragma instantiate POA_CORBA_AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>
-#pragma instantiate POA_CORBA_LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>
+#pragma instantiate POA_CORBA::ValueDef_tie<TAO_ValueDef_i>
+#pragma instantiate POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i>
+#pragma instantiate POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i>
+#pragma instantiate POA_CORBA::OperationDef_tie<TAO_OperationDef_i>
+#pragma instantiate POA_CORBA::InterfaceDef_tie<TAO_>
+#pragma instantiate POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>
+#pragma instantiate POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>
 
 #pragma instantiate auto_ptr<TAO_Repository_i>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Repository_i>