1 files changed, 4 insertions, 33 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index a14c04293dc..b6aadc05d8a 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -28,6 +28,7 @@
 #include "Active_Object_Map.h"
 
 #include "tao/Adapter.h"
+#include "tao/Adapter_Factory.h"
 #include "tao/Server_Strategy_Factory.h"
 
 // Local Object
@@ -43,6 +44,8 @@
 // Policy Set
 #include "POA_Policy_Set.h"
 
+#include "Servant_Location.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -52,16 +55,6 @@
 
 // ****************************************************************
 
-enum TAO_SERVANT_LOCATION
-{
-  TAO_SERVANT_FOUND,
-  TAO_DEFAULT_SERVANT,
-  TAO_SERVANT_MANAGER,
-  TAO_SERVANT_NOT_FOUND
-};
-
-// ****************************************************************
-
 // Forward declaration
 class TAO_POA;
 class TAO_POA_Manager;
@@ -377,8 +370,6 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
-  void set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL);
-
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
 
@@ -848,8 +839,7 @@ public:
 private:
 
   /// Helper method to get collocated servant
-  TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp
-                                           ACE_ENV_ARG_DECL);
+  TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp);
 
 private:
 
@@ -880,25 +870,6 @@ private:
 
 // ****************************************************************
 
-class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_Object_Adapter_Factory (void);
-
-  // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for
-  // details.
-  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
-
-  virtual int init (int argc,
-                    ACE_TCHAR* argv[]);
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
-
-// ****************************************************************
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
 #endif /* _MSC_VER */