1 files changed, 8 insertions, 38 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index 34b8c050eb0..e8f0b60d804 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -62,44 +62,14 @@ module FT
   exception PrimaryNotSet {};
 
 #ifdef FT_USES_PORTABLE_GROUP
-  /////////////////////////////////////////
-  // The following typedefs "import"
-  // definitions from the PortableGroup module
-  // definitions into the FT module.
-  // This is an interim step during the process
-  // of having FT depend on the commmon
-  // of PortableGroup module rather than defining
-  // everything itself.
-
-  // this typedef trick doesn't work for exceptions, so they must
-  // use the PortableGroup:: prefix
-  typedef PortableGroup::_TypeId _TypeId;
-  typedef PortableGroup::ObjectGroup ObjectGroup;
-  typedef PortableGroup::Name Name;
-  typedef PortableGroup::Value Value;
-  typedef PortableGroup::Property Property;
-  typedef PortableGroup::Properties Properties;
-  typedef PortableGroup::Location Location;
-  typedef PortableGroup::Locations Locations;
-  typedef PortableGroup::Criteria Criteria;
-
-  typedef PortableGroup::FactoryInfo FactoryInfo;
-  typedef PortableGroup::FactoryInfos FactoryInfos;
-  typedef PortableGroup::MembershipStyleValue MembershipStyleValue;
-
-  typedef PortableGroup::FactoriesValue FactoriesValue;
-  typedef PortableGroup::InitialNumberMembersValue InitialNumberMembersValue;
-  typedef PortableGroup::MinimumNumberMembersValue MinimumNumberMembersValue;
-  typedef PortableGroup::PropertyManager PropertyManager;
-  typedef PortableGroup::ObjectGroupManager ObjectGroupManager;
-  typedef PortableGroup::GenericFactory GenericFactory;
-
-  // Specification of FTObjectGroupManager Interface
-  // which ReplicationManager Inherits
+
+  /**
+   * FTObjectGroupManager Interface adds primary support to PortableGroup::ObjectGroupManager
+   */
   interface FTObjectGroupManager : PortableGroup::ObjectGroupManager {
 
-    ObjectGroup set_primary_member(in ObjectGroup object_group,
-                                   in Location the_location)
+    ::PortableGroup::ObjectGroup set_primary_member(in ::PortableGroup::ObjectGroup object_group,
+                                   in ::PortableGroup::Location the_location)
       raises(PortableGroup::ObjectGroupNotFound,
              PortableGroup::MemberNotFound,
              PrimaryNotSet,
@@ -118,8 +88,8 @@ module FT
 
   /// FT::MembershipStyle
   const string FT_MEMBERSHIP_STYLE = PortableGroup::PG_MEMBERSHIP_STYLE;
-  const MembershipStyleValue MEMB_APP_CTRL = PortableGroup::MEMB_APP_CTRL;
-  const MembershipStyleValue MEMB_INF_CTRL = PortableGroup::MEMB_INF_CTRL;
+  const PortableGroup::MembershipStyleValue MEMB_APP_CTRL = PortableGroup::MEMB_APP_CTRL;
+  const PortableGroup::MembershipStyleValue MEMB_INF_CTRL = PortableGroup::MEMB_INF_CTRL;
 
   /// FT::FaultMonitoringStyle
   const string FT_FAULT_MONITORING_STYLE = "org.omg.ft.FaultMonitoringStyle";