It is not possible to compile the client side library with router support.

5 files changed, 38 insertions, 7 deletions

diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp
index a0a46486b25..221213b5e66 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.cpp
+++ b/cppe/src/IceE/OutgoingConnectionFactory.cpp
@@ -350,7 +350,9 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 	// received over such connections.
 	//
 	ObjectPrx proxy = routerInfo->getClientProxy();
+#ifndef ICEE_PURE_CLIENT
 	ObjectAdapterPtr adapter = routerInfo->getAdapter();
+#endif
 	vector<EndpointPtr> endpoints = proxy->__reference()->getEndpoints();
 	vector<EndpointPtr>::const_iterator p;
 	for(p = endpoints.begin(); p != endpoints.end(); ++p)
@@ -365,6 +367,7 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 		endpoint = endpoint->timeout(_instance->defaultsAndOverrides()->overrideTimeoutValue);
 	    }
 
+#ifndef ICEE_PURE_CLIENT
 	    pair<multimap<EndpointPtr, ConnectionPtr>::iterator,
 		 multimap<EndpointPtr, ConnectionPtr>::iterator> pr = _connections.equal_range(endpoint);
 	    
@@ -382,8 +385,9 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 		}
 		++pr.first;
 	    }
+#endif
 	}
-    }    
+    }
 }
 
 #endif
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index e590920dbd9..307b5dca782 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -780,12 +780,12 @@ IceInternal::DirectReference::getConnection() const
     ConnectionPtr connection = factory->create(filteredEndpoints);
     assert(connection);
 
+#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_PURE_CLIENT)
     //
     // If we have a router, set the object adapter for this router
     // (if any) to the new connection, so that callbacks from the
     // router can be received over this new connection.
     //
-#ifdef ICEE_HAS_ROUTER
     if(getRouterInfo())
     {
         connection->setAdapter(getRouterInfo()->getAdapter());
@@ -1048,12 +1048,12 @@ IceInternal::IndirectReference::getConnection() const
 	break;
     }
 
+#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_PURE_CLIENT)
     //
     // If we have a router, set the object adapter for this router
     // (if any) to the new connection, so that callbacks from the
     // router can be received over this new connection.
     //
-#ifdef ICEE_HAS_ROUTER
     if(getRouterInfo())
     {
         connection->setAdapter(getRouterInfo()->getAdapter());
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index c8dcaaa32c3..074a1b4b263 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -97,7 +97,9 @@ IceInternal::RouterInfo::destroy()
 
     _clientProxy = 0;
     _serverProxy = 0;
+#ifndef ICEE_PURE_CLIENT
     _adapter = 0;
+#endif
     _routingTable->clear();
 }
 
@@ -208,6 +210,7 @@ IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
     }
 }
 
+#ifndef ICEE_PURE_CLIENT
 void
 IceInternal::RouterInfo::setAdapter(const ObjectAdapterPtr& adapter)
 {
@@ -221,5 +224,6 @@ IceInternal::RouterInfo::getAdapter() const
     IceUtil::Mutex::Lock sync(*this);
     return _adapter;
 }
+#endif
 
 #endif
diff --git a/cppe/src/IceE/RouterInfo.h b/cppe/src/IceE/RouterInfo.h
index cff07a02984..9ebc42cfc86 100644
--- a/cppe/src/IceE/RouterInfo.h
+++ b/cppe/src/IceE/RouterInfo.h
@@ -17,6 +17,9 @@
 #include <IceE/RouterInfoF.h>
 #include <IceE/RouterF.h>
 #include <IceE/RoutingTableF.h>
+#ifndef ICEE_PURE_CLIENT
+#    include <IceE/ObjectAdapterF.h>
+#endif
 #include <IceE/Shared.h>
 #include <IceE/Mutex.h>
 
@@ -61,8 +64,10 @@ public:
     Ice::ObjectPrx getServerProxy();
     void setServerProxy(const Ice::ObjectPrx&);
     void addProxy(const Ice::ObjectPrx&);
+#ifndef ICEE_PURE_CLIENT
     void setAdapter(const Ice::ObjectAdapterPtr&);
     Ice::ObjectAdapterPtr getAdapter() const;
+#endif
 
 private:
 
@@ -70,7 +75,9 @@ private:
     Ice::ObjectPrx _clientProxy;
     Ice::ObjectPrx _serverProxy;
     const RoutingTablePtr _routingTable;
+#ifndef ICEE_PURE_CLIENT
     Ice::ObjectAdapterPtr _adapter;
+#endif
 };
 
 }
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index b8815591abe..4fd464b10d7 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\	copy $(OutDir)\iceec10d.pdb
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c

 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                    $(OutDir)\iceec.lib                                    ..\..\lib\ 

+PostBuild_Cmds=copy                                     $(OutDir)\iceec.lib                                     ..\..\lib\ 

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"

@@ -149,8 +149,8 @@ PostBuild_Cmds=copy                                    $(OutDir)\iceec.lib
 # PROP Intermediate_Dir "DebugStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c

 # ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                   $(OutDir)\iceecd.lib                                   ..\..\lib\ 

+PostBuild_Cmds=copy                                    $(OutDir)\iceecd.lib                                    ..\..\lib\ 

 # End Special Build Tool

 

 !ENDIF 

@@ -318,6 +318,18 @@ SOURCE=..\IceE\ReferenceFactory.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=..\IceE\Router.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\IceE\RouterInfo.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\IceE\RoutingTable.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\IceE\RWRecMutex.cpp

 # End Source File

 # Begin Source File

@@ -658,6 +670,10 @@ SOURCE=..\IceE\ReferenceFactoryF.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\IceE\RoutingTable.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\IceE\RWRecMutex.h

 # End Source File

 # Begin Source File