ChangeLogTag:Tue Apr 18 14:32:08 2000 Nanbor Wang <nanbor@cs.wustl.edu>

author: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-04-18 19:36:22 +0000
committer: nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-04-18 19:36:22 +0000
commit: 4ade979839646ec1e985a12483d40e19ae8c8725 (patch)
tree: e0ad96cc2b324d5a6997f56677eb008985a29f64
parent: 083824e40a9c9b82cb88520f564a3c8e4d18b0f1 (diff)
download: ATCD-4ade979839646ec1e985a12483d40e19ae8c8725.tar.gz
27 files changed, 356 insertions, 325 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3637ced020f..28f3c25ae24 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,34 @@
+Tue Apr 18 14:32:08 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tao/CurrentC.cpp:
+	* tao/CurrentC.h:
+	* tao/DomainC.cpp:
+	* tao/DomainC.h:
+	* tao/DynAnyC.cpp:
+	* tao/DynAnyC.h:
+	* tao/IORC.cpp:
+	* tao/IORC.h:
+	* tao/ImplRepoC.cpp:
+	* tao/ImplRepoC.h:
+	* tao/InterceptorC.cpp:
+	* tao/InterceptorC.h:
+	* tao/InterfaceC.cpp:
+	* tao/InterfaceC.h:
+	* tao/MessagingC.cpp:
+	* tao/MessagingC.h:
+	* tao/POAC.cpp:
+	* tao/POAC.h:
+	* tao/POA_CORBA.h:
+	* tao/PolicyC.cpp:
+	* tao/PollableC.cpp:
+	* tao/PollableC.h:
+	* tao/RT_Current.cpp:
+	* tao/RT_Current.h:
+	* tao/TAOC.cpp:
+	* tao/TAOC.h: Renamed method <_interface_repository_id> to
+	  <_remote_interface_repository_id>.
+
+
 Tue Apr 18 03:17:37 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tao/corba.h: Included "tao/LocalObject" in this file.
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 67de2c2d57e..ea5e9c2a9aa 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -84,7 +84,7 @@ CORBA::Boolean CORBA_Current::_is_a (const CORBA::Char *value, CORBA::Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_Current::_interface_repository_id (void) const
+const char* CORBA_Current::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Current:1.0";
 }
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 1045dea6352..d60214bb16d 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -132,7 +132,7 @@ class  CORBA_Current : public virtual CORBA_Object
                                 CORBA_Environment &ACE_TRY_ENV =
                                     TAO_default_environment ()
                                 );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
  protected:
   CORBA_Current (void); // default constructor
   CORBA_Current (TAO_Stub *objref,
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index b62ba363fe7..36969df1959 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -164,7 +164,7 @@ CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_DomainManager::_interface_repository_id (void) const
+const char* CORBA_DomainManager::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/DomainManager:1.0";
 }
@@ -304,7 +304,7 @@ CORBA::Boolean CORBA::ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
+const char* CORBA::ConstructionPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
 }
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index fceee5685f4..f77301237f5 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -108,7 +108,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 
 protected:
   CORBA_DomainManager (void);
@@ -274,7 +274,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 
 protected:
   CORBA_ConstructionPolicy (void);
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index d829b46338a..58a9fc7fc70 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -750,7 +750,7 @@ CORBA::Boolean CORBA_DynAny::_is_a (const CORBA::Char *value,
                                       env); // remote call
 }
 
-const char* CORBA_DynAny::_interface_repository_id (void) const
+const char* CORBA_DynAny::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynAny:1.0";
 }
@@ -859,7 +859,7 @@ CORBA::Boolean CORBA_DynEnum::_is_a (const CORBA::Char *value,
                                       env); // remote call
 }
 
-const char* CORBA_DynEnum::_interface_repository_id (void) const
+const char* CORBA_DynEnum::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynEnum:1.0";
 }
@@ -1068,7 +1068,7 @@ CORBA::Boolean CORBA_DynStruct::_is_a (const CORBA::Char *value,
                                       env); // remote call
 }
 
-const char* CORBA_DynStruct::_interface_repository_id (void) const
+const char* CORBA_DynStruct::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynStruct:1.0";
 }
@@ -1205,7 +1205,7 @@ CORBA::Boolean CORBA_DynUnion::_is_a (const CORBA::Char *value,
                                       env); // remote call
 }
 
-const char* CORBA_DynUnion::_interface_repository_id (void) const
+const char* CORBA_DynUnion::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynUnion:1.0";
 }
@@ -1371,7 +1371,7 @@ CORBA::Boolean CORBA_DynSequence::_is_a (const CORBA::Char *value,
                                       env); // remote call
 }
 
-const char* CORBA_DynSequence::_interface_repository_id (void) const
+const char* CORBA_DynSequence::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynSequence:1.0";
 }
@@ -1472,7 +1472,7 @@ CORBA::Boolean CORBA_DynArray::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, env); // remote call
 }
 
-const char* CORBA_DynArray::_interface_repository_id (void) const
+const char* CORBA_DynArray::_remote_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynArray:1.0";
 }
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 70dc30d99db..dba4149554a 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -418,7 +418,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynAny (void); // default constructor
   CORBA_DynAny (TAO_Stub *objref,
@@ -518,7 +518,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynEnum (void); // default constructor
   CORBA_DynEnum (TAO_Stub *objref,
@@ -594,7 +594,7 @@ struct TAO_Export CORBA_NameValuePair
 };
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_NAMEVALUEPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_NAMEVALUEPAIRSEQ_CH_
 
@@ -602,9 +602,9 @@ struct TAO_Export CORBA_NameValuePair
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum,
         CORBA::ULong length,
         CORBA_NameValuePair *data,
@@ -621,7 +621,7 @@ struct TAO_Export CORBA_NameValuePair
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       CORBA_NameValuePair *get_buffer (CORBA::Boolean orphan = 0);
       const CORBA_NameValuePair *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -633,10 +633,10 @@ struct TAO_Export CORBA_NameValuePair
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 class CORBA_NameValuePairSeq_var;
-  
+
 // *************************************************************
 // CORBA::NameValuePairSeq
 // *************************************************************
@@ -803,7 +803,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynStruct (void); // default constructor
   CORBA_DynStruct (TAO_Stub *objref,
@@ -919,7 +919,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynUnion (void); // default constructor
   CORBA_DynUnion (TAO_Stub *objref,
@@ -1291,7 +1291,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynSequence (void); // default constructor
   CORBA_DynSequence (TAO_Stub *objref,
@@ -1382,7 +1382,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DynArray (void); // default constructor
   CORBA_DynArray (TAO_Stub *objref,
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
index 62c525d1707..460cb79a1a1 100644
--- a/TAO/tao/IORC.cpp
+++ b/TAO/tao/IORC.cpp
@@ -444,7 +444,7 @@ CORBA::Boolean TAO_IOP::TAO_IOR_Manipulation::_is_a (const CORBA::Char *value, C
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
+const char* TAO_IOP::TAO_IOR_Manipulation::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
 }
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index e30401ea91e..57517b91980 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -452,7 +452,7 @@ TAO_NAMESPACE  TAO_IOP
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     TAO_IOR_Manipulation (void);
diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp
index f376425f58f..3f3b1fbc75e 100644
--- a/TAO/tao/ImplRepoC.cpp
+++ b/TAO/tao/ImplRepoC.cpp
@@ -292,7 +292,7 @@ CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* ImplementationRepository::ServerObject::_interface_repository_id (void) const
+const char* ImplementationRepository::ServerObject::_remote_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerObject:1.0";
 }
@@ -2398,7 +2398,7 @@ CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Cha
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* ImplementationRepository::Administration::_interface_repository_id (void) const
+const char* ImplementationRepository::Administration::_remote_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/Administration:1.0";
 }
@@ -2968,7 +2968,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
+const char* ImplementationRepository::ServerInformationIterator::_remote_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
diff --git a/TAO/tao/ImplRepoC.h b/TAO/tao/ImplRepoC.h
index 5a189a7a576..1d9531cdbd0 100644
--- a/TAO/tao/ImplRepoC.h
+++ b/TAO/tao/ImplRepoC.h
@@ -49,7 +49,7 @@ TAO_NAMESPACE  ImplementationRepository
 
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -63,14 +63,14 @@ TAO_NAMESPACE  ImplementationRepository
     ServerObject_var (ServerObject_ptr);
     ServerObject_var (const ServerObject_var &); // copy constructor
     ~ServerObject_var (void); // destructor
-    
+
     ServerObject_var &operator= (ServerObject_ptr);
     ServerObject_var &operator= (const ServerObject_var &);
     ServerObject_ptr operator-> (void) const;
-    
+
     operator const ServerObject_ptr &() const;
     operator ServerObject_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerObject_ptr in (void) const;
     ServerObject_ptr &inout (void);
     ServerObject_ptr &out (void);
@@ -100,7 +100,7 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-    
+
   private:
     ServerObject_ptr &ptr_;
   };
@@ -124,12 +124,12 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &env = 
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
     static ServerObject_ptr _nil (void)
@@ -140,7 +140,7 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
     static void _tao_any_destructor (void*);
 
     virtual void ping (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -148,7 +148,7 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
       ));
 
     virtual void shutdown (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -156,16 +156,16 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &env = 
+        const CORBA::Char *type_id,
+        CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     ServerObject (void);
-    ServerObject (TAO_Stub *objref, 
-        TAO_ServantBase *_tao_servant = 0, 
+    ServerObject (TAO_Stub *objref,
+        TAO_ServantBase *_tao_servant = 0,
         CORBA::Boolean _tao_collocated = 0
       );
     virtual ~ServerObject (void);
@@ -177,14 +177,14 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object)
 class TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory
 {
 public:
-  
+
   TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (int register_proxy_factory = 1);
-  
+
   virtual ~TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (void);
-  
+
   virtual ServerObject_ptr create_proxy (
       ServerObject_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 };
@@ -192,23 +192,23 @@ public:
 class TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter
 {
 public:
-  
+
   friend class ACE_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
-  
+
   int register_proxy_factory (
       TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *df,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   int unregister_proxy_factory (
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   ServerObject_ptr create_proxy (
       ServerObject_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 
@@ -230,7 +230,7 @@ protected:
     TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (::ImplementationRepository::ServerObject_ptr proxy);
     ~TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (void);
       virtual void ping (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -238,7 +238,7 @@ protected:
     ));
 
   virtual void shutdown (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -277,18 +277,18 @@ public:
   EnvironmentVariable_var (EnvironmentVariable *);
   EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor
   ~EnvironmentVariable_var (void); // destructor
-  
+
   EnvironmentVariable_var &operator= (EnvironmentVariable *);
   EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
   EnvironmentVariable *operator-> (void);
   const EnvironmentVariable *operator-> (void) const;
-  
+
   operator const EnvironmentVariable &() const;
   operator EnvironmentVariable &();
   operator EnvironmentVariable &() const;
   operator EnvironmentVariable *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   const EnvironmentVariable &in (void) const;
   EnvironmentVariable &inout (void);
   EnvironmentVariable *&out (void);
@@ -310,7 +310,7 @@ public:
   operator EnvironmentVariable *&();
   EnvironmentVariable *&ptr (void);
   EnvironmentVariable *operator-> (void);
-  
+
 private:
   EnvironmentVariable *&ptr_;
   // assignment from T_var not allowed
@@ -326,7 +326,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
 
@@ -334,9 +334,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
       CORBA::ULong length,
       EnvironmentVariable *data,
@@ -353,7 +353,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
+
     EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
     const EnvironmentVariable *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -365,7 +365,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
@@ -377,20 +377,20 @@ class EnvironmentList_var;
 // EnvironmentList
 // *************************************************************
 
-class TAO_Export EnvironmentList : public 
+class TAO_Export EnvironmentList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   EnvironmentList (void); // default ctor
   EnvironmentList (CORBA::ULong max); // uses max size
   EnvironmentList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    EnvironmentVariable *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    EnvironmentVariable *buffer,
     CORBA::Boolean release=0
   );
   EnvironmentList (const EnvironmentList &); // copy ctor
@@ -420,19 +420,19 @@ public:
   EnvironmentList_var (EnvironmentList *);
   EnvironmentList_var (const EnvironmentList_var &); // copy constructor
   ~EnvironmentList_var (void); // destructor
-  
+
   EnvironmentList_var &operator= (EnvironmentList *);
   EnvironmentList_var &operator= (const EnvironmentList_var &);
   EnvironmentList *operator-> (void);
   const EnvironmentList *operator-> (void) const;
-  
+
   operator const EnvironmentList &() const;
   operator EnvironmentList &();
   operator EnvironmentList &() const;
   operator EnvironmentList *&(); // variable-size base types only
-  
+
   EnvironmentVariable &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const EnvironmentList &in (void) const;
   EnvironmentList &inout (void);
   EnvironmentList *&out (void);
@@ -462,7 +462,7 @@ public:
   EnvironmentList *&ptr (void);
   EnvironmentList *operator-> (void);
   EnvironmentVariable &operator[] (CORBA::ULong index);
-  
+
 private:
   EnvironmentList *&ptr_;
   // assignment from T_var not allowed
@@ -510,18 +510,18 @@ public:
   StartupOptions_var (StartupOptions *);
   StartupOptions_var (const StartupOptions_var &); // copy constructor
   ~StartupOptions_var (void); // destructor
-  
+
   StartupOptions_var &operator= (StartupOptions *);
   StartupOptions_var &operator= (const StartupOptions_var &);
   StartupOptions *operator-> (void);
   const StartupOptions *operator-> (void) const;
-  
+
   operator const StartupOptions &() const;
   operator StartupOptions &();
   operator StartupOptions &() const;
   operator StartupOptions *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   const StartupOptions &in (void) const;
   StartupOptions &inout (void);
   StartupOptions *&out (void);
@@ -543,7 +543,7 @@ public:
   operator StartupOptions *&();
   StartupOptions *&ptr (void);
   StartupOptions *operator-> (void);
-  
+
 private:
   StartupOptions *&ptr_;
   // assignment from T_var not allowed
@@ -577,18 +577,18 @@ public:
   ServerInformation_var (ServerInformation *);
   ServerInformation_var (const ServerInformation_var &); // copy constructor
   ~ServerInformation_var (void); // destructor
-  
+
   ServerInformation_var &operator= (ServerInformation *);
   ServerInformation_var &operator= (const ServerInformation_var &);
   ServerInformation *operator-> (void);
   const ServerInformation *operator-> (void) const;
-  
+
   operator const ServerInformation &() const;
   operator ServerInformation &();
   operator ServerInformation &() const;
   operator ServerInformation *&(); // variable-size types only
-  
-  // in, inout, out, _retn 
+
+  // in, inout, out, _retn
   const ServerInformation &in (void) const;
   ServerInformation &inout (void);
   ServerInformation *&out (void);
@@ -610,7 +610,7 @@ public:
   operator ServerInformation *&();
   ServerInformation *&ptr (void);
   ServerInformation *operator-> (void);
-  
+
 private:
   ServerInformation *&ptr_;
   // assignment from T_var not allowed
@@ -621,7 +621,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
 
@@ -629,9 +629,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
   {
   public:
     // = Initialization and termination methods.
-    
+
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
       CORBA::ULong length,
       ServerInformation *data,
@@ -648,7 +648,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-    
+
     ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
     const ServerInformation *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -660,7 +660,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
@@ -672,20 +672,20 @@ class ServerInformationList_var;
 // ServerInformationList
 // *************************************************************
 
-class TAO_Export ServerInformationList : public 
+class TAO_Export ServerInformationList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 {
 public:
   ServerInformationList (void); // default ctor
   ServerInformationList (CORBA::ULong max); // uses max size
   ServerInformationList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    ServerInformation *buffer, 
+    CORBA::ULong max,
+    CORBA::ULong length,
+    ServerInformation *buffer,
     CORBA::Boolean release=0
   );
   ServerInformationList (const ServerInformationList &); // copy ctor
@@ -715,19 +715,19 @@ public:
   ServerInformationList_var (ServerInformationList *);
   ServerInformationList_var (const ServerInformationList_var &); // copy constructor
   ~ServerInformationList_var (void); // destructor
-  
+
   ServerInformationList_var &operator= (ServerInformationList *);
   ServerInformationList_var &operator= (const ServerInformationList_var &);
   ServerInformationList *operator-> (void);
   const ServerInformationList *operator-> (void) const;
-  
+
   operator const ServerInformationList &() const;
   operator ServerInformationList &();
   operator ServerInformationList &() const;
   operator ServerInformationList *&(); // variable-size base types only
-  
+
   ServerInformation &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   const ServerInformationList &in (void) const;
   ServerInformationList &inout (void);
   ServerInformationList *&out (void);
@@ -757,7 +757,7 @@ public:
   ServerInformationList *&ptr (void);
   ServerInformationList *operator-> (void);
   ServerInformation &operator[] (CORBA::ULong index);
-  
+
 private:
   ServerInformationList *&ptr_;
   // assignment from T_var not allowed
@@ -789,14 +789,14 @@ public:
   ServerInformationIterator_var (ServerInformationIterator_ptr);
   ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
   ~ServerInformationIterator_var (void); // destructor
-  
+
   ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
   ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
   ServerInformationIterator_ptr operator-> (void) const;
-  
+
   operator const ServerInformationIterator_ptr &() const;
   operator ServerInformationIterator_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServerInformationIterator_ptr in (void) const;
   ServerInformationIterator_ptr &inout (void);
   ServerInformationIterator_ptr &out (void);
@@ -826,7 +826,7 @@ public:
   operator ServerInformationIterator_ptr &();
   ServerInformationIterator_ptr &ptr (void);
   ServerInformationIterator_ptr operator-> (void);
-  
+
 private:
   ServerInformationIterator_ptr &ptr_;
 };
@@ -854,14 +854,14 @@ public:
   Administration_var (Administration_ptr);
   Administration_var (const Administration_var &); // copy constructor
   ~Administration_var (void); // destructor
-  
+
   Administration_var &operator= (Administration_ptr);
   Administration_var &operator= (const Administration_var &);
   Administration_ptr operator-> (void) const;
-  
+
   operator const Administration_ptr &() const;
   operator Administration_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   Administration_ptr in (void) const;
   Administration_ptr &inout (void);
   Administration_ptr &out (void);
@@ -891,7 +891,7 @@ public:
   operator Administration_ptr &();
   Administration_ptr &ptr (void);
   Administration_ptr operator-> (void);
-  
+
 private:
   Administration_ptr &ptr_;
 };
@@ -915,12 +915,12 @@ public:
   static Administration_ptr _duplicate (Administration_ptr obj);
   static Administration_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static Administration_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static Administration_ptr _nil (void)
@@ -1045,7 +1045,7 @@ public:
 
   virtual void activate_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1057,7 +1057,7 @@ public:
   virtual void register_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1068,7 +1068,7 @@ public:
   virtual void reregister_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1077,7 +1077,7 @@ public:
 
   virtual void remove_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1087,7 +1087,7 @@ public:
 
   virtual void shutdown_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1099,7 +1099,7 @@ public:
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1109,7 +1109,7 @@ public:
 
   virtual void server_is_shutting_down (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1120,7 +1120,7 @@ public:
   virtual void find (
       const char * server,
       ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1132,7 +1132,7 @@ public:
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1140,16 +1140,16 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 
 protected:
   Administration (void);
-  Administration (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  Administration (TAO_Stub *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~Administration (void);
@@ -1161,14 +1161,14 @@ private:
 class TAO_ImplementationRepository_Administration_Default_Proxy_Factory
 {
 public:
-  
+
   TAO_ImplementationRepository_Administration_Default_Proxy_Factory (int register_proxy_factory = 1);
-  
+
   virtual ~TAO_ImplementationRepository_Administration_Default_Proxy_Factory (void);
-  
+
   virtual Administration_ptr create_proxy (
       Administration_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 };
@@ -1176,23 +1176,23 @@ public:
 class TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter
 {
 public:
-  
+
   friend class ACE_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
-  
+
   int register_proxy_factory (
       TAO_ImplementationRepository_Administration_Default_Proxy_Factory *df,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   int unregister_proxy_factory (
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   Administration_ptr create_proxy (
       Administration_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 
@@ -1215,7 +1215,7 @@ protected:
     ~TAO_ImplementationRepository_Administration_Smart_Proxy_Base (void);
       virtual void activate_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1227,7 +1227,7 @@ protected:
   virtual void register_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1238,7 +1238,7 @@ protected:
   virtual void reregister_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1247,7 +1247,7 @@ protected:
 
   virtual void remove_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1257,7 +1257,7 @@ protected:
 
   virtual void shutdown_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1269,7 +1269,7 @@ protected:
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1279,7 +1279,7 @@ protected:
 
   virtual void server_is_shutting_down (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1290,7 +1290,7 @@ protected:
   virtual void find (
       const char * server,
       ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1302,7 +1302,7 @@ protected:
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1338,14 +1338,14 @@ public:
   ServerInformationIterator_var (ServerInformationIterator_ptr);
   ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
   ~ServerInformationIterator_var (void); // destructor
-  
+
   ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
   ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
   ServerInformationIterator_ptr operator-> (void) const;
-  
+
   operator const ServerInformationIterator_ptr &() const;
   operator ServerInformationIterator_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   ServerInformationIterator_ptr in (void) const;
   ServerInformationIterator_ptr &inout (void);
   ServerInformationIterator_ptr &out (void);
@@ -1375,7 +1375,7 @@ public:
   operator ServerInformationIterator_ptr &();
   ServerInformationIterator_ptr &ptr (void);
   ServerInformationIterator_ptr operator-> (void);
-  
+
 private:
   ServerInformationIterator_ptr &ptr_;
 };
@@ -1399,12 +1399,12 @@ public:
   static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
   static ServerInformationIterator_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static ServerInformationIterator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
   static ServerInformationIterator_ptr _nil (void)
@@ -1417,7 +1417,7 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1425,7 +1425,7 @@ public:
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1433,16 +1433,16 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
+      const CORBA::Char *type_id,
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 
 protected:
   ServerInformationIterator (void);
-  ServerInformationIterator (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
+  ServerInformationIterator (TAO_Stub *objref,
+      TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
   virtual ~ServerInformationIterator (void);
@@ -1454,14 +1454,14 @@ private:
 class TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory
 {
 public:
-  
+
   TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (int register_proxy_factory = 1);
-  
+
   virtual ~TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (void);
-  
+
   virtual ServerInformationIterator_ptr create_proxy (
       ServerInformationIterator_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 };
@@ -1469,23 +1469,23 @@ public:
 class TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter
 {
 public:
-  
+
   friend class ACE_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
-  
+
   int register_proxy_factory (
       TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *df,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   int unregister_proxy_factory (
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
-  
+
   ServerInformationIterator_ptr create_proxy (
       ServerInformationIterator_ptr proxy,
-      CORBA::Environment &env = 
+      CORBA::Environment &env =
         TAO_default_environment ()
     );
 
@@ -1509,7 +1509,7 @@ protected:
       virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1517,7 +1517,7 @@ protected:
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1611,7 +1611,7 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
index 18288afc61a..5bdc29a2268 100644
--- a/TAO/tao/InterceptorC.cpp
+++ b/TAO/tao/InterceptorC.cpp
@@ -74,7 +74,7 @@ CORBA::Boolean PortableInterceptor::Cookie::_is_a (const CORBA::Char *value, COR
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* PortableInterceptor::Cookie::_interface_repository_id (void) const
+const char* PortableInterceptor::Cookie::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/PortableInterceptor/Cookie:1.0";
 }
@@ -300,7 +300,7 @@ CORBA::Boolean PortableInterceptor::Interceptor::_is_a (const CORBA::Char *value
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* PortableInterceptor::Interceptor::_interface_repository_id (void) const
+const char* PortableInterceptor::Interceptor::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/PortableInterceptor/Interceptor:1.0";
 }
@@ -375,7 +375,7 @@ CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::_is_a (const CORBA
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const
+const char* PortableInterceptor::ServerRequestInterceptor::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/PortableInterceptor/ServerRequestInterceptor:1.0";
 }
@@ -450,7 +450,7 @@ CORBA::Boolean PortableInterceptor::ClientRequestInterceptor::_is_a (const CORBA
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository_id (void) const
+const char* PortableInterceptor::ClientRequestInterceptor::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/PortableInterceptor/ClientRequestInterceptor:1.0";
 }
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
index 9eecd93f3f3..5df343c6230 100644
--- a/TAO/tao/InterceptorC.h
+++ b/TAO/tao/InterceptorC.h
@@ -139,7 +139,7 @@ class TAO_Export Cookie : public virtual ACE_CORBA_1 (Object)
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     Cookie (void);
@@ -401,7 +401,7 @@ class TAO_Export Interceptor : public virtual ACE_CORBA_1 (Object)
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     Interceptor (void);
@@ -549,7 +549,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     ServerRequestInterceptor (void);
@@ -697,7 +697,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     ClientRequestInterceptor (void);
diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp
index 54f61c394e8..03831644e3e 100644
--- a/TAO/tao/InterfaceC.cpp
+++ b/TAO/tao/InterfaceC.cpp
@@ -258,7 +258,7 @@ CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_IRObject::_interface_repository_id (void) const
+const char* CORBA_IRObject::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/IRObject:1.0";
 }
@@ -1051,7 +1051,7 @@ CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA_Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_Contained::_interface_repository_id (void) const
+const char* CORBA_Contained::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Contained:1.0";
 }
@@ -3388,7 +3388,7 @@ CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA_Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_Container::_interface_repository_id (void) const
+const char* CORBA_Container::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Container:1.0";
 }
@@ -3521,7 +3521,7 @@ CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA_Environment
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_IDLType::_interface_repository_id (void) const
+const char* CORBA_IDLType::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/IDLType:1.0";
 }
@@ -4097,7 +4097,7 @@ CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value, CORBA_Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_Repository::_interface_repository_id (void) const
+const char* CORBA_Repository::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Repository:1.0";
 }
@@ -4173,7 +4173,7 @@ CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value, CORBA_Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ModuleDef::_interface_repository_id (void) const
+const char* CORBA_ModuleDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
@@ -4596,7 +4596,7 @@ CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value, CORBA_Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ConstantDef::_interface_repository_id (void) const
+const char* CORBA_ConstantDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ConstantDef:1.0";
 }
@@ -4726,7 +4726,7 @@ CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA_Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_TypedefDef::_interface_repository_id (void) const
+const char* CORBA_TypedefDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
@@ -4976,7 +4976,7 @@ CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value, CORBA_Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_StructDef::_interface_repository_id (void) const
+const char* CORBA_StructDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/StructDef:1.0";
 }
@@ -5354,7 +5354,7 @@ CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_UnionDef::_interface_repository_id (void) const
+const char* CORBA_UnionDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/UnionDef:1.0";
 }
@@ -5552,7 +5552,7 @@ CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value, CORBA_Environment
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_EnumDef::_interface_repository_id (void) const
+const char* CORBA_EnumDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/EnumDef:1.0";
 }
@@ -5749,7 +5749,7 @@ CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_AliasDef::_interface_repository_id (void) const
+const char* CORBA_AliasDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/AliasDef:1.0";
 }
@@ -5883,7 +5883,7 @@ CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA_Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_PrimitiveDef::_interface_repository_id (void) const
+const char* CORBA_PrimitiveDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
 }
@@ -6078,7 +6078,7 @@ CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value, CORBA_Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_StringDef::_interface_repository_id (void) const
+const char* CORBA_StringDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/StringDef:1.0";
 }
@@ -6273,7 +6273,7 @@ CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value, CORBA_Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_WstringDef::_interface_repository_id (void) const
+const char* CORBA_WstringDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/WstringDef:1.0";
 }
@@ -6588,7 +6588,7 @@ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_FixedDef::_interface_repository_id (void) const
+const char* CORBA_FixedDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/FixedDef:1.0";
 }
@@ -6962,7 +6962,7 @@ CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value, CORBA_Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_SequenceDef::_interface_repository_id (void) const
+const char* CORBA_SequenceDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/SequenceDef:1.0";
 }
@@ -7335,7 +7335,7 @@ CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ArrayDef::_interface_repository_id (void) const
+const char* CORBA_ArrayDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ArrayDef:1.0";
 }
@@ -7591,7 +7591,7 @@ CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value, CORBA_Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ExceptionDef::_interface_repository_id (void) const
+const char* CORBA_ExceptionDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ExceptionDef:1.0";
 }
@@ -8030,7 +8030,7 @@ CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value, CORBA_Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_AttributeDef::_interface_repository_id (void) const
+const char* CORBA_AttributeDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/AttributeDef:1.0";
 }
@@ -9435,7 +9435,7 @@ CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value, CORBA_Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_OperationDef::_interface_repository_id (void) const
+const char* CORBA_OperationDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/OperationDef:1.0";
 }
@@ -10973,7 +10973,7 @@ CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value, CORBA_Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_InterfaceDef::_interface_repository_id (void) const
+const char* CORBA_InterfaceDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/InterfaceDef:1.0";
 }
@@ -11675,7 +11675,7 @@ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA_Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
+const char* CORBA_ValueMemberDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
 }
@@ -13454,7 +13454,7 @@ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA_Environmen
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ValueDef::_interface_repository_id (void) const
+const char* CORBA_ValueDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueDef:1.0";
 }
@@ -13744,7 +13744,7 @@ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA_Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
+const char* CORBA_ValueBoxDef::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
 }
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
index 3807acee33f..f4d13857376 100644
--- a/TAO/tao/InterfaceC.h
+++ b/TAO/tao/InterfaceC.h
@@ -145,7 +145,7 @@ class TAO_Export CORBA_IRObject : public virtual ACE_CORBA_1 (Object)
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_IRObject (void);
@@ -568,7 +568,7 @@ class TAO_Export CORBA_Contained: public virtual CORBA_IRObject
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_Contained (void);
@@ -2800,7 +2800,7 @@ class TAO_Export CORBA_Container: public virtual CORBA_IRObject
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_Container (void);
@@ -2916,7 +2916,7 @@ class TAO_Export CORBA_IDLType: public virtual CORBA_IRObject
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_IDLType (void);
@@ -3420,7 +3420,7 @@ class TAO_Export CORBA_Repository: public virtual CORBA_Container
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_Repository (void);
@@ -3527,7 +3527,7 @@ class TAO_Export CORBA_ModuleDef: public virtual CORBA_Container, public virtual
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ModuleDef (void);
@@ -3733,7 +3733,7 @@ class TAO_Export CORBA_ConstantDef: public virtual CORBA_Contained
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ConstantDef (void);
@@ -3897,7 +3897,7 @@ class TAO_Export CORBA_TypedefDef: public virtual CORBA_Contained, public virtua
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_TypedefDef (void);
@@ -4077,7 +4077,7 @@ class TAO_Export CORBA_StructDef: public virtual CORBA_TypedefDef, public virtua
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_StructDef (void);
@@ -4227,7 +4227,7 @@ class TAO_Export CORBA_UnionDef: public virtual CORBA_TypedefDef, public virtual
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_UnionDef (void);
@@ -4351,7 +4351,7 @@ class TAO_Export CORBA_EnumDef: public virtual CORBA_TypedefDef
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_EnumDef (void);
@@ -4475,7 +4475,7 @@ class TAO_Export CORBA_AliasDef: public virtual CORBA_TypedefDef
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_AliasDef (void);
@@ -4590,7 +4590,7 @@ class TAO_Export CORBA_PrimitiveDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_PrimitiveDef (void);
@@ -4715,7 +4715,7 @@ class TAO_Export CORBA_StringDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_StringDef (void);
@@ -4839,7 +4839,7 @@ class TAO_Export CORBA_WstringDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_WstringDef (void);
@@ -4981,7 +4981,7 @@ class TAO_Export CORBA_FixedDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_FixedDef (void);
@@ -5130,7 +5130,7 @@ class TAO_Export CORBA_SequenceDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_SequenceDef (void);
@@ -5280,7 +5280,7 @@ class TAO_Export CORBA_ArrayDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ArrayDef (void);
@@ -5412,7 +5412,7 @@ class TAO_Export CORBA_ExceptionDef: public virtual CORBA_Contained, public virt
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ExceptionDef (void);
@@ -5618,7 +5618,7 @@ class TAO_Export CORBA_AttributeDef: public virtual CORBA_Contained
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_AttributeDef (void);
@@ -6444,7 +6444,7 @@ class TAO_Export CORBA_OperationDef: public virtual CORBA_Contained
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_OperationDef (void);
@@ -7112,7 +7112,7 @@ class TAO_Export CORBA_InterfaceDef: public virtual CORBA_Container, public virt
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_InterfaceDef (void);
@@ -7516,7 +7516,7 @@ class TAO_Export CORBA_ValueMemberDef: public virtual CORBA_Contained
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ValueMemberDef (void);
@@ -7870,7 +7870,7 @@ class TAO_Export CORBA_ValueDef: public virtual CORBA_Container, public virtual
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ValueDef (void);
@@ -8056,7 +8056,7 @@ class TAO_Export CORBA_ValueBoxDef: public virtual CORBA_IDLType
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     CORBA_ValueBoxDef (void);
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index e3da125c1c2..28cd2983110 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -235,7 +235,7 @@ CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RebindPolicy::_interface_repository_id (void) const
+const char* Messaging::RebindPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RebindPolicy:1.0";
 }
@@ -318,7 +318,7 @@ CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORB
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
+const char* Messaging::SyncScopePolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/SyncScopePolicy:1.0";
 }
@@ -429,7 +429,7 @@ CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
+const char* Messaging::RequestPriorityPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RequestPriorityPolicy:1.0";
 }
@@ -507,7 +507,7 @@ CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
+const char* Messaging::ReplyPriorityPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/ReplyPriorityPolicy:1.0";
 }
@@ -590,7 +590,7 @@ CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *valu
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
+const char* Messaging::RequestStartTimePolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RequestStartTimePolicy:1.0";
 }
@@ -673,7 +673,7 @@ CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
+const char* Messaging::RequestEndTimePolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RequestEndTimePolicy:1.0";
 }
@@ -756,7 +756,7 @@ CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
+const char* Messaging::ReplyStartTimePolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/ReplyStartTimePolicy:1.0";
 }
@@ -839,7 +839,7 @@ CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, C
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
+const char* Messaging::ReplyEndTimePolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/ReplyEndTimePolicy:1.0";
 }
@@ -922,7 +922,7 @@ CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
+const char* Messaging::RelativeRequestTimeoutPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0";
 }
@@ -1006,7 +1006,7 @@ CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Ch
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
+const char* Messaging::RelativeRoundtripTimeoutPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0";
 }
@@ -1117,7 +1117,7 @@ CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA:
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
+const char* Messaging::RoutingPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/RoutingPolicy:1.0";
 }
@@ -1200,7 +1200,7 @@ CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA:
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
+const char* Messaging::MaxHopsPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/MaxHopsPolicy:1.0";
 }
@@ -1283,7 +1283,7 @@ CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, COR
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
+const char* Messaging::QueueOrderPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/QueueOrderPolicy:1.0";
 }
@@ -1581,7 +1581,7 @@ CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::ReplyHandler::_interface_repository_id (void) const
+const char* Messaging::ReplyHandler::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/ReplyHandler:1.0";
 }
@@ -2113,7 +2113,7 @@ CORBA::Boolean Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* Messaging::Poller::_interface_repository_id (void) const
+const char* Messaging::Poller::_remote_interface_repository_id (void) const
 {
   return "IDL:Messaging/Poller:1.0";
 }
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 6d08b3d7069..b02ec904262 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -201,7 +201,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RebindPolicy (void); // default constructor
     RebindPolicy (TAO_Stub *objref,
@@ -299,7 +299,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     SyncScopePolicy (void); // default constructor
     SyncScopePolicy (TAO_Stub *objref,
@@ -436,7 +436,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RequestPriorityPolicy (void); // default constructor
     RequestPriorityPolicy (TAO_Stub *objref,
@@ -530,7 +530,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ReplyPriorityPolicy (void); // default constructor
     ReplyPriorityPolicy (TAO_Stub *objref,
@@ -628,7 +628,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RequestStartTimePolicy (void); // default constructor
     RequestStartTimePolicy (TAO_Stub *objref,
@@ -726,7 +726,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RequestEndTimePolicy (void); // default constructor
     RequestEndTimePolicy (TAO_Stub *objref,
@@ -824,7 +824,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ReplyStartTimePolicy (void); // default constructor
     ReplyStartTimePolicy (TAO_Stub *objref,
@@ -922,7 +922,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ReplyEndTimePolicy (void); // default constructor
     ReplyEndTimePolicy (TAO_Stub *objref,
@@ -1020,7 +1020,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RelativeRequestTimeoutPolicy (void); // default constructor
     RelativeRequestTimeoutPolicy (TAO_Stub *objref,
@@ -1118,7 +1118,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RelativeRoundtripTimeoutPolicy (void); // default constructor
     RelativeRoundtripTimeoutPolicy (TAO_Stub *objref,
@@ -1255,7 +1255,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RoutingPolicy (void); // default constructor
     RoutingPolicy (TAO_Stub *objref,
@@ -1353,7 +1353,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     MaxHopsPolicy (void); // default constructor
     MaxHopsPolicy (TAO_Stub *objref,
@@ -1451,7 +1451,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     QueueOrderPolicy (void); // default constructor
     QueueOrderPolicy (TAO_Stub *objref,
@@ -1948,7 +1948,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ReplyHandler (void); // default constructor
     ReplyHandler (TAO_Stub *objref,
@@ -2069,7 +2069,7 @@ TAO_NAMESPACE  Messaging
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     Poller (void); // default constructor
     Poller (TAO_Stub *objref,
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index d86bc6b79bc..de5b9f2dfd8 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -436,7 +436,7 @@ CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CO
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
+const char* PortableServer::ThreadPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
 }
@@ -602,7 +602,7 @@ CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
+const char* PortableServer::LifespanPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
 }
@@ -766,7 +766,7 @@ CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *val
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
+const char* PortableServer::IdUniquenessPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
 }
@@ -929,7 +929,7 @@ CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *val
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
+const char* PortableServer::IdAssignmentPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
 }
@@ -1095,7 +1095,7 @@ CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Cha
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
+const char* PortableServer::ImplicitActivationPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
 }
@@ -1259,7 +1259,7 @@ CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
+const char* PortableServer::ServantRetentionPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
 }
@@ -1423,7 +1423,7 @@ CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
+const char* PortableServer::RequestProcessingPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
 }
@@ -1594,7 +1594,7 @@ CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORB
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::POAManager::_interface_repository_id (void) const
+const char* PortableServer::POAManager::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/POAManager:1.0";
 }
@@ -1669,7 +1669,7 @@ CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
+const char* PortableServer::AdapterActivator::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
 }
@@ -1742,7 +1742,7 @@ CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantManager::_interface_repository_id (void) const
+const char* PortableServer::ServantManager::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantManager:1.0";
 }
@@ -1816,7 +1816,7 @@ CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantActivator::_interface_repository_id (void) const
+const char* PortableServer::ServantActivator::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantActivator:1.0";
 }
@@ -1890,7 +1890,7 @@ CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantLocator::_interface_repository_id (void) const
+const char* PortableServer::ServantLocator::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantLocator:1.0";
 }
@@ -2878,7 +2878,7 @@ CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::POA::_interface_repository_id (void) const
+const char* PortableServer::POA::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/POA:1.0";
 }
@@ -3098,7 +3098,7 @@ CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::Current::_interface_repository_id (void) const
+const char* PortableServer::Current::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/Current:1.0";
 }
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 87641bc86a7..28087acb2b4 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -352,7 +352,7 @@ TAO_NAMESPACE PortableServer{
     virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ThreadPolicy (TAO_Stub *objref = 0,
                   TAO_ServantBase *servant = 0,
@@ -462,7 +462,7 @@ TAO_NAMESPACE PortableServer{
     virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     LifespanPolicy (
                     TAO_Stub *objref = 0,
@@ -572,7 +572,7 @@ TAO_NAMESPACE PortableServer{
     virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     IdUniquenessPolicy (
                         TAO_Stub *objref = 0,
@@ -682,7 +682,7 @@ TAO_NAMESPACE PortableServer{
     virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     IdAssignmentPolicy (
                         TAO_Stub *objref = 0,
@@ -795,7 +795,7 @@ TAO_NAMESPACE PortableServer{
     virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ImplicitActivationPolicy (
                               TAO_Stub *objref = 0,
@@ -910,7 +910,7 @@ TAO_NAMESPACE PortableServer{
     virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ServantRetentionPolicy (
                             TAO_Stub *objref = 0,
@@ -1026,7 +1026,7 @@ TAO_NAMESPACE PortableServer{
     virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
 #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     RequestProcessingPolicy (
                              TAO_Stub *objref = 0,
@@ -1175,7 +1175,7 @@ TAO_NAMESPACE PortableServer{
 
     virtual State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     POAManager (
                 TAO_Stub *objref = 0,
@@ -1274,7 +1274,7 @@ TAO_NAMESPACE PortableServer{
 
     virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     AdapterActivator (
                       TAO_Stub *objref = 0,
@@ -1372,7 +1372,7 @@ TAO_NAMESPACE PortableServer{
     static void _tao_any_destructor (void*);
 
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ServantManager (
                     TAO_Stub *objref = 0,
@@ -1471,7 +1471,7 @@ TAO_NAMESPACE PortableServer{
     virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ServantActivator (
                       TAO_Stub *objref = 0,
@@ -1573,7 +1573,7 @@ TAO_NAMESPACE PortableServer{
     virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     ServantLocator (
                     TAO_Stub *objref = 0,
@@ -2093,7 +2093,7 @@ TAO_NAMESPACE PortableServer{
     virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0;
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     POA (
          TAO_Stub *objref = 0,
@@ -2225,7 +2225,7 @@ TAO_NAMESPACE PortableServer{
     virtual POA_ptr  get_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
     virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
     virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   protected:
     Current (
              TAO_Stub *objref = 0,
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index b03c6265f7a..8893e1c3e1c 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -76,7 +76,7 @@ public:
       );
 
     ACE_CORBA_1(Current) *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef Current_ptr _ptr_type;
@@ -190,7 +190,7 @@ public:
     CORBA_Policy_ptr _this (
         CORBA_Environment &ACE_TRY_ENV =
           TAO_default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef Policy_ptr _ptr_type;
@@ -259,7 +259,7 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   };
 
   class TAO_Export _tao_collocated_PolicyManager : public virtual CORBA::PolicyManager
@@ -319,7 +319,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   };
 
   class TAO_Export _tao_collocated_PolicyCurrent     : public virtual CORBA::PolicyCurrent,
@@ -394,7 +394,7 @@ public:
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
     virtual CORBA::Policy_ptr get_domain_policy (
       CORBA::PolicyType policy_type,
       CORBA::Environment &ACE_TRY_ENV =
@@ -501,7 +501,7 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   };
 
   class TAO_Export _tao_collocated_Pollable : public virtual CORBA::Pollable
@@ -595,7 +595,7 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   };
 
   class TAO_Export _tao_collocated_DIIPollable : public virtual CORBA::DIIPollable,
@@ -726,7 +726,7 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
   };
 
   class TAO_Export _tao_collocated_PollableSet : public virtual CORBA::PollableSet
@@ -836,11 +836,11 @@ public:
           CORBA::Environment::default_environment ()
       ) = 0;
 
-	  virtual void insert_char (
-			  CORBA::Char value,
-			  CORBA::Environment &ACE_TRY_ENV =
-				  CORBA::Environment::default_environment ()
-		  ) = 0;
+          virtual void insert_char (
+                          CORBA::Char value,
+                          CORBA::Environment &ACE_TRY_ENV =
+                                  CORBA::Environment::default_environment ()
+                  ) = 0;
 
     virtual void insert_short (
         CORBA::Short value,
@@ -1026,7 +1026,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynAny_ptr _ptr_type;
@@ -1284,7 +1284,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynEnum_ptr _ptr_type;
@@ -1373,7 +1373,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynStruct_ptr _ptr_type;
@@ -1482,7 +1482,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynUnion_ptr _ptr_type;
@@ -1596,7 +1596,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynSequence_ptr _ptr_type;
@@ -1675,7 +1675,7 @@ public:
           CORBA::Environment::default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
     typedef DynArray_ptr _ptr_type;
@@ -1764,7 +1764,7 @@ public:
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
     virtual void make_domain_manager (
       CORBA::InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy,
@@ -1861,7 +1861,7 @@ public:
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
     virtual IR::DefinitionKind def_kind (
         CORBA::Environment &ACE_TRY_ENV =
@@ -1978,7 +1978,7 @@ public:
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index f6f945b2e86..695baf27052 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -425,7 +425,7 @@ CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_Policy::_interface_repository_id (void) const
+const char* CORBA_Policy::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Policy:1.0";
 }
@@ -548,7 +548,7 @@ CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_PolicyManager::_interface_repository_id (void) const
+const char* CORBA_PolicyManager::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PolicyManager:1.0";
 }
@@ -600,7 +600,7 @@ CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
+const char* CORBA_PolicyCurrent::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
 }
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 8d6d93c7ad8..367e1a94c64 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -239,7 +239,7 @@ CORBA::Boolean CORBA_Pollable::_is_a (const CORBA::Char *value, CORBA::Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_Pollable::_interface_repository_id (void) const
+const char* CORBA_Pollable::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Pollable:1.0";
 }
@@ -335,7 +335,7 @@ CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Envir
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA::DIIPollable::_interface_repository_id (void) const
+const char* CORBA::DIIPollable::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/DIIPollable:1.0";
 }
@@ -884,7 +884,7 @@ CORBA::Boolean CORBA_PollableSet::_is_a (const CORBA::Char *value, CORBA::Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call
 }
 
-const char* CORBA_PollableSet::_interface_repository_id (void) const
+const char* CORBA_PollableSet::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PollableSet:1.0";
 }
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index a5a543c5465..e47044e0532 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -172,7 +172,7 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_Pollable (void); // default constructor
   CORBA_Pollable (TAO_Stub *objref,
@@ -258,7 +258,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_DIIPollable (void); // default constructor
   CORBA_DIIPollable (TAO_Stub *objref,
@@ -397,7 +397,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 protected:
   CORBA_PollableSet (void); // default constructor
   CORBA_PollableSet (TAO_Stub *objref,
diff --git a/TAO/tao/RT_Current.cpp b/TAO/tao/RT_Current.cpp
index 4edbd6e0581..7b3359c4a7c 100644
--- a/TAO/tao/RT_Current.cpp
+++ b/TAO/tao/RT_Current.cpp
@@ -62,7 +62,7 @@ CORBA::Boolean TAO_RT_Current::_is_a (const char *value,
   return 0;
 }
 
-const char* TAO_RT_Current::_interface_repository_id (void) const
+const char* TAO_RT_Current::_remote_interface_repository_id (void) const
 {
   return "IDL:omg.org/RTCORBA/Current:1.0";
 }
diff --git a/TAO/tao/RT_Current.h b/TAO/tao/RT_Current.h
index 8790b05ca20..6794d11fd43 100644
--- a/TAO/tao/RT_Current.h
+++ b/TAO/tao/RT_Current.h
@@ -87,7 +87,7 @@ public:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  virtual const char* _interface_repository_id (void) const;
+  virtual const char* _remote_interface_repository_id (void) const;
 
 private:
   TAO_RT_Current (const TAO_RT_Current &);
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 839fb244e42..520e522bc1c 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -126,7 +126,7 @@ CORBA::Boolean TAO::ClientPriorityPolicy::_is_a (const CORBA::Char *value, CORBA
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* TAO::ClientPriorityPolicy::_interface_repository_id (void) const
+const char* TAO::ClientPriorityPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/ClientPriorityPolicy:1.0";
 }
@@ -473,7 +473,7 @@ CORBA::Boolean TAO::BufferingConstraintPolicy::_is_a (const CORBA::Char *value,
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const
+const char* TAO::BufferingConstraintPolicy::_remote_interface_repository_id (void) const
 {
   return "IDL:TAO/BufferingConstraintPolicy:1.0";
 }
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 3f34dfe6460..0e57a7d0034 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -206,7 +206,7 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     ClientPriorityPolicy (void);
@@ -389,7 +389,7 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _remote_interface_repository_id (void) const;
 
   protected:
     BufferingConstraintPolicy (void);
author	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-04-18 19:36:22 +0000
committer	nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-04-18 19:36:22 +0000
commit	4ade979839646ec1e985a12483d40e19ae8c8725 (patch)
tree	e0ad96cc2b324d5a6997f56677eb008985a29f64
parent	083824e40a9c9b82cb88520f564a3c8e4d18b0f1 (diff)
download	ATCD-4ade979839646ec1e985a12483d40e19ae8c8725.tar.gz