6 files changed, 8 insertions, 10 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index ab36bd0fa84..a41fe1bec54 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -78,10 +78,10 @@ public:
   /// Default @c _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (void) = 0;
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Query the Interface Repository.
   virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0;
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Default @c _get_component: always returns nil.
   virtual CORBA::Object_ptr _get_component (void) = 0;
 #endif
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 90def769086..4a9f50341d7 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -490,6 +490,7 @@ CORBA::Object::_non_existent (void)
 }
 
 
+#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
 CORBA::InterfaceDef_ptr
 CORBA::Object::_get_interface (void)
 {
@@ -503,7 +504,6 @@ CORBA::Object::_get_implementation (void)
   return 0;
 }
 
-#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 CORBA::Object::_get_component (void)
 {
@@ -530,8 +530,7 @@ CORBA::Object::_repository_id (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-CORBA::Object::_get_policy (
-  CORBA::PolicyType type)
+CORBA::Object::_get_policy (CORBA::PolicyType type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -542,8 +541,7 @@ CORBA::Object::_get_policy (
 }
 
 CORBA::Policy_ptr
-CORBA::Object::_get_cached_policy (
-  TAO_Cached_Policy_Type type)
+CORBA::Object::_get_cached_policy (TAO_Cached_Policy_Type type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 9cd6bd9b6eb..1976c89d79c 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -155,6 +155,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _non_existent (void);
 
+#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// This method is deprecated in the CORBA 2.2 spec, we just return 0
     /// every time.
     virtual CORBA::ImplementationDef_ptr _get_implementation (void);
@@ -162,7 +163,6 @@ namespace CORBA
     /// Get info about the object from the Interface Repository.
     virtual InterfaceDef_ptr _get_interface (void);
 
-#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// Get info about the object from the Interface Repository.
     virtual CORBA::Object_ptr _get_component (void);
 #endif
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index ff7d58ac6f9..14a0c3ea224 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -62,9 +62,9 @@ namespace TAO
 
   virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target) = 0;
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::InterfaceDef *_get_interface (CORBA::Object_ptr target) = 0;
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target) = 0;
 #endif
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 55e31f41113..bc946d33eb9 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -168,7 +168,6 @@ namespace TAO
 
     return _tao_retval._retn ();
   }
-#endif
 
   CORBA::InterfaceDef_ptr
   Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target)
@@ -212,6 +211,7 @@ namespace TAO
 
     return _tao_retval;
   }
+#endif
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index 2b74af5a912..56f4000a383 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -51,9 +51,9 @@ namespace TAO
 
   virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target);
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target);
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target);
 #endif