1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index e866050e703..0cf755006bc 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -23,17 +23,17 @@ EventChannelFactory_i::EventChannelFactory_i(const char* conf_filename, CORBA::O
 
 CORBA::Object_ptr EventChannelFactory_i::create_object (
   const char * type_id,
-  const FT::Criteria & the_criteria,
-  FT::GenericFactory::FactoryCreationId_out factory_creation_id
+  const PortableGroup::Criteria & the_criteria,
+  PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
-  , FT::NoFactory
-  , FT::ObjectNotCreated
-  , FT::InvalidCriteria
-  , FT::InvalidProperty
-  , FT::CannotMeetCriteria
+  , PortableGroup::NoFactory
+  , PortableGroup::ObjectNotCreated
+  , PortableGroup::InvalidCriteria
+  , PortableGroup::InvalidProperty
+  , PortableGroup::CannotMeetCriteria
   ))
 {
 
@@ -41,7 +41,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
 
   FILE* file = fopen(conf_file, "r");
   if (file == NULL)
-    ACE_THROW_RETURN(FT::NoFactory(), CORBA::Object::_nil());
+    ACE_THROW_RETURN(PortableGroup::NoFactory(), CORBA::Object::_nil());
 
   ScopeGuard file_guard = MakeGuard(fclose, file);
   ACE_UNUSED_ARG(file_guard);
@@ -64,16 +64,16 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
       }
     }
 
-    ACE_THROW_RETURN(FT::ObjectNotCreated(), CORBA::Object::_nil());
+    ACE_THROW_RETURN(PortableGroup\::ObjectNotCreated(), CORBA::Object::_nil());
 }
 
 void EventChannelFactory_i::delete_object (
-  const FT::GenericFactory::FactoryCreationId & factory_creation_id
+  const PortableGroup\::GenericFactory::FactoryCreationId & factory_creation_id
   ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
-  , FT::ObjectNotFound
+  , PortableGroup\::ObjectNotFound
   ))
 {
   ACE_TRACE("EventChannelFactory_i::delete_object");
@@ -88,8 +88,8 @@ void EventChannelFactory_i::delete_object (
 
 CORBA::Object_ptr EventChannelFactory_i::create_process (
   char * process_str,
-  const FT::Criteria & the_criteria,
-  FT::GenericFactory::FactoryCreationId_out factory_creation_id)
+  const PortableGroup\::Criteria & the_criteria,
+  PortableGroup\::GenericFactory::FactoryCreationId_out factory_creation_id)
 {
   ACE_TRACE("EventChannelFactory_i::create_process");
 
@@ -98,7 +98,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   // fill the factory_creation_id
 
   ACE_NEW_RETURN(factory_creation_id,
-    FT::GenericFactory::FactoryCreationId,
+    PortableGroup\::GenericFactory::FactoryCreationId,
     CORBA::Object::_nil());
   *factory_creation_id <<= (CORBA::ULong) ++id;