1 files changed, 10 insertions, 17 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 5ceb0ce6878..a3605dc2f11 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -15,17 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Key_Adapters.h"
-#include "tao/PortableServer/poa_macros.h"
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/Default_Policy_Validator.h"
-#include "tao/PortableServer/POA_Policy_Set.h"
+#include "Key_Adapters.h"
+#include "poa_macros.h"
+#include "Servant_Location.h"
+#include "Default_Policy_Validator.h"
+#include "POA_Policy_Set.h"
 
 #include "tao/Adapter.h"
 #include "tao/Adapter_Factory.h"
@@ -36,15 +36,13 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Map_T.h"
 
-#include "tao/PortableServer/Servant_Location.h"
+#include "Servant_Location.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Root_POA;
 class TAO_POA_Manager;
 class TAO_TSS_Resources;
@@ -172,7 +170,8 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
+                                                    CORBA::Object_ptr);
 
 protected:
 
@@ -218,10 +217,6 @@ protected:
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
 
-  virtual void do_dispatch (TAO_ServerRequest& req,
-                            TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
-
 public:
 
   /**
@@ -502,14 +497,12 @@ private:
   TAO_POA_Policy_Set default_poa_policies_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Object_Adapter.i"
+# include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"