From d331c4f5778d3287334175fdf9c8191d659fe0f5 Mon Sep 17 00:00:00 2001
From: Marc Laukien <marc@zeroc.com>
Date: Thu, 27 Sep 2001 20:54:00 +0000
Subject: more collocation stuff

---
 cpp/src/Ice/ObjectAdapterFactory.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'cpp/src/Ice/ObjectAdapterFactory.h')

diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 5c014ae6efb..9b0bb7478c8 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -11,12 +11,7 @@
 #ifndef ICE_OBJECT_ADAPTER_FACTORY_H
 #define ICE_OBJECT_ADAPTER_FACTORY_H
 
-#include <IceUtil/Shared.h>
-#include <Ice/ObjectAdapterFactoryF.h>
-#include <Ice/InstanceF.h>
-#include <Ice/ObjectAdapterF.h>
-#include <Ice/ProxyF.h>
-#include <Ice/ObjectF.h>
+#include <Ice/ObjectAdapterI.h>
 
 namespace IceInternal
 {
@@ -27,7 +22,7 @@ public:
 
     void shutdown();
     ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const std::string&);
-    ::Ice::ObjectPtr proxyToServant(const ::Ice::ObjectPrx&);
+    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&);
 
 private:
 
@@ -36,7 +31,7 @@ private:
     friend class Instance;
 
     InstancePtr _instance;
-    std::map<std::string, ::Ice::ObjectAdapterPtr> _adapters;
+    std::map<std::string, ::Ice::ObjectAdapterIPtr> _adapters;
 };
 
 }
-- 
cgit v1.2.3