Removed ICE_NO_ROUTER & ICE_NO_LOCATOR

9 files changed, 10 insertions, 109 deletions

diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice
index b3717398660..f4c07ade4ad 100644
--- a/cpp/slice/Ice/Communicator.ice
+++ b/cpp/slice/Ice/Communicator.ice
@@ -10,23 +10,14 @@
 #ifndef ICE_COMMUNICATOR_ICE
 #define ICE_COMMUNICATOR_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
 #include <Ice/LoggerF.ice>
-#ifndef ICEE
 #include <Ice/StatsF.ice>
-#endif
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/PropertiesF.ice>
-#ifndef ICEE
 #include <Ice/ObjectFactoryF.ice>
-#endif
 #include <Ice/RouterF.ice>
 #include <Ice/LocatorF.ice>
-#ifndef ICEE
 #include <Ice/PluginF.ice>
-#endif
 #include <Ice/Current.ice>
 
 /**
@@ -177,8 +168,6 @@ local interface Communicator
      **/
     ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints);
 
-#ifndef ICEE
-
     /**
      *
      * Add a servant factory to this communicator. Installing a
@@ -256,8 +245,6 @@ local interface Communicator
      **/
     nonmutating ObjectFactory findObjectFactory(string id);
 
-#endif /* ICEE */
-
     /**
      *
      * Set a default context on this communicator. Once set,
@@ -316,7 +303,6 @@ local interface Communicator
      **/
     void setLogger(Logger log);
 
-#ifndef ICEE
     /**
      *
      * Get the statistics callback object for this communicator.
@@ -341,9 +327,7 @@ local interface Communicator
      *
      **/
     void setStats(Stats st);
-#endif
 
-#ifndef ICE_NO_ROUTER
     /**
      *
      * Get the default router this communicator.
@@ -375,10 +359,6 @@ local interface Communicator
      **/
     void setDefaultRouter(Router* rtr);
 
-#endif
-
-#ifndef ICE_NO_LOCATOR
-
     /**
      *
      * Get the default locator this communicator.
@@ -413,9 +393,6 @@ local interface Communicator
      **/
     void setDefaultLocator(Locator* loc);
 
-#endif
-
-#ifndef ICEE
     /**
      *
      * Get the plug-in manager for this communicator.
@@ -426,7 +403,6 @@ local interface Communicator
      *
      **/
     nonmutating PluginManager getPluginManager();
-#endif
 
     /**
      *
diff --git a/cpp/slice/Ice/IceEConfig.ice b/cpp/slice/Ice/IceEConfig.ice
deleted file mode 100644
index 893f35d399e..00000000000
--- a/cpp/slice/Ice/IceEConfig.ice
+++ /dev/null
@@ -1,27 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICE_USER_CONFIG
-#define ICE_USER_CONFIG
-
-//
-// Uncomment the following define if you want to build Ice-E
-// without Router support.
-//
-#define ICE_NO_ROUTER
-
-//
-//
-// Uncomment the following define if you want to build Ice-E
-// without Locator support.
-//
-
-#define ICE_NO_LOCATOR 
-
-#endif
diff --git a/cpp/slice/Ice/LocalException.ice b/cpp/slice/Ice/LocalException.ice
index 816a0634528..58dd161caaa 100644
--- a/cpp/slice/Ice/LocalException.ice
+++ b/cpp/slice/Ice/LocalException.ice
@@ -10,9 +10,6 @@
 #ifndef ICE_LOCAL_EXCEPTION_ICE
 #define ICE_LOCAL_EXCEPTION_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
@@ -138,7 +135,6 @@ local exception ObjectAdapterDeactivatedException
  * the same adapter id.
  *
  **/
-#ifndef ICE_NO_LOCATOR
 local exception ObjectAdapterIdInUseException
 {
     /**
@@ -148,7 +144,6 @@ local exception ObjectAdapterIdInUseException
      **/
     string id;
 };
-#endif
 
 /**
  *
diff --git a/cpp/slice/Ice/Locator.ice b/cpp/slice/Ice/Locator.ice
index 7618457627c..29257b39dd2 100644
--- a/cpp/slice/Ice/Locator.ice
+++ b/cpp/slice/Ice/Locator.ice
@@ -10,12 +10,6 @@
 #ifndef ICE_LOCATOR_ICE
 #define ICE_LOCATOR_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
-
-#ifndef ICE_NO_LOCATOR
-
 #include <Ice/Identity.ice>
 #ifndef ICEE
 #include <Ice/ProcessF.ice>
@@ -174,5 +168,3 @@ interface LocatorRegistry
 };
 
 #endif
-
-#endif
diff --git a/cpp/slice/Ice/LocatorF.ice b/cpp/slice/Ice/LocatorF.ice
index 255e2351039..0bae7c1b376 100644
--- a/cpp/slice/Ice/LocatorF.ice
+++ b/cpp/slice/Ice/LocatorF.ice
@@ -10,12 +10,6 @@
 #ifndef ICE_LOCATOR_F_ICE
 #define ICE_LOCATOR_F_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
-
-#ifndef ICE_NO_LOCATOR
-
 module Ice
 {
 
@@ -25,5 +19,3 @@ interface LocatorRegistry;
 };
 
 #endif
-
-#endif
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index 65e81462ace..fe7f268fc7a 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -10,9 +10,6 @@
 #ifndef ICE_OBJECT_ADAPTER_ICE
 #define ICE_OBJECT_ADAPTER_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
 #include <Ice/CommunicatorF.ice>
 #ifndef ICEE
 #include <Ice/ServantLocatorF.ice>
@@ -498,7 +495,6 @@ local interface ObjectAdapter
      **/
     nonmutating Object* createReverseProxy(Identity id);
 
-#ifndef ICE_NO_ROUTER
     /**
      *
      * Add a router to this object adapter. By doing so,
@@ -520,9 +516,7 @@ local interface ObjectAdapter
      *
      **/
     void addRouter(Router* rtr);
-#endif
 
-#ifndef ICE_NO_LOCATOR
     /**
      * Set an &Ice; locator for this object adapter. By doing so, the
      * object adapter will register itself with the locator registry
@@ -538,7 +532,6 @@ local interface ObjectAdapter
      * 
      **/
     void setLocator(Locator* loc);
-#endif
 };
 
 };
diff --git a/cpp/slice/Ice/Router.ice b/cpp/slice/Ice/Router.ice
index f1d17c70e4f..117be355647 100644
--- a/cpp/slice/Ice/Router.ice
+++ b/cpp/slice/Ice/Router.ice
@@ -10,12 +10,6 @@
 #ifndef ICE_ROUTER_ICE
 #define ICE_ROUTER_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
-
-#ifndef ICE_NO_ROUTER
-
 module Ice
 {
 
@@ -66,5 +60,3 @@ interface Router
 };
 
 #endif
-
-#endif
diff --git a/cpp/slice/Ice/RouterF.ice b/cpp/slice/Ice/RouterF.ice
index 70087d501ee..d009983180b 100644
--- a/cpp/slice/Ice/RouterF.ice
+++ b/cpp/slice/Ice/RouterF.ice
@@ -10,12 +10,6 @@
 #ifndef ICE_ROUTER_F_ICE
 #define ICE_ROUTER_F_ICE
 
-#ifdef ICEE
-#include <Ice/IceEConfig.ice>
-#endif
-
-#ifndef ICE_NO_ROUTER
-
 module Ice
 {
 
@@ -24,5 +18,3 @@ interface Router;
 };
 
 #endif
-
-#endif
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 51933ca3de6..d04bbb6061e 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -1165,24 +1165,20 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
     H << sp << nl << "virtual ::IceInternal::Handle< ::IceDelegate::Ice::Object> __createDelegate();";
     H << eb << ';';
 
+    string flatName = p->flattenedScope() + p->name() + "_ids";
+
+    StringList ids;
+    getIds(p, ids);
+
+    StringList::const_iterator firstIter = ids.begin();
+    StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
+    assert(scopedIter != ids.end());
+    StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter);
 
     C << sp;
     C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()";
     C << sb;
-    if(!_ice)
-    {
-        string flatName = p->flattenedScope() + p->name() + "_ids";
-
-        StringList ids;
-        getIds(p, ids);
-
-        StringList::const_iterator firstIter = ids.begin();
-        StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
-        assert(scopedIter != ids.end());
-        StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter);
-
-        C << nl << "return " << flatName << '[' << scopedPos << "];";
-    }
+    C << nl << "return " << flatName << '[' << scopedPos << "];";
     C << eb;
 
     C << sp << nl << "::IceInternal::Handle< ::IceDelegate::Ice::Object>";