_NO_ -> _HAS_

26 files changed, 143 insertions, 143 deletions

diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index 02a05205c43..ecb717f1768 100755
--- a/cppe/src/IceE/Communicator.cpp
+++ b/cppe/src/IceE/Communicator.cpp
@@ -109,7 +109,7 @@ Ice::Communicator::setLogger(const LoggerPtr& logger)
     _instance->logger(logger);
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 RouterPrx
 Ice::Communicator::getDefaultRouter() const
@@ -135,7 +135,7 @@ Ice::Communicator::setDefaultRouter(const RouterPrx& router)
 
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 LocatorPrx
 Ice::Communicator::getDefaultLocator() const
@@ -183,7 +183,7 @@ Ice::Communicator::getDefaultContext() const
     return _instance->getDefaultContext();
 }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 Ice::Communicator::flushBatchRequests()
 {
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 51fe80eac59..4b5542db74d 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -383,7 +383,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
     }
 }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 Ice::Connection::prepareBatchRequest(BasicStream* os)
 {
@@ -718,7 +718,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
     _traceLevels(_instance->traceLevels()), // Cached for better performance.
     _warn(_instance->properties()->getPropertyAsInt("IceE.Warn.Connections") > 0),
     _requestHdr(headerSize + sizeof(Int), 0),
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     _requestBatchHdr(headerSize + sizeof(Int), 0),
     _batchStream(_instance.get()),

     _batchStreamInUse(false),

@@ -745,7 +745,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
     requestHdr[8] = requestMsg;
     requestHdr[9] = 0;
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     vector<Byte>& requestBatchHdr = const_cast<vector<Byte>&>(_requestBatchHdr);
     requestBatchHdr[0] = magic[0];
     requestBatchHdr[1] = magic[1];
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp
index c9a92ee7998..b9b61e2b75c 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.cpp
+++ b/cppe/src/IceE/DefaultsAndOverrides.cpp
@@ -30,7 +30,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 	const_cast<string&>(defaultHost) = getLocalHost(true);
     }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     const_cast<string&>(defaultRouter) = properties->getProperty("IceE.Default.Router");
 #endif
 
@@ -50,7 +50,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 	const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("IceE.Override.ConnectTimeout");
     }
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     const_cast<string&>(defaultLocator) = properties->getProperty("IceE.Default.Locator");
 #endif
 }
diff --git a/cppe/src/IceE/DefaultsAndOverrides.h b/cppe/src/IceE/DefaultsAndOverrides.h
index 489c20707e6..c77634d860a 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.h
+++ b/cppe/src/IceE/DefaultsAndOverrides.h
@@ -24,10 +24,10 @@ public:
     DefaultsAndOverrides(const ::Ice::PropertiesPtr&);
 
     std::string defaultHost;
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     std::string defaultRouter;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     std::string defaultLocator;
 #endif
 
diff --git a/cppe/src/IceE/IncomingConnectionFactory.h b/cppe/src/IceE/IncomingConnectionFactory.h
index 1b21fe0e149..11fc19a5fda 100755
--- a/cppe/src/IceE/IncomingConnectionFactory.h
+++ b/cppe/src/IceE/IncomingConnectionFactory.h
@@ -42,7 +42,7 @@ public:
     EndpointPtr endpoint() const;
     bool equivalent(const EndpointPtr&) const;
     std::list<Ice::ConnectionPtr> connections() const;
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index 5b54939578a..21aca63583b 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -10,11 +10,11 @@
 #include <IceE/Instance.h>
 #include <IceE/TraceLevels.h>
 #include <IceE/DefaultsAndOverrides.h>
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
@@ -104,7 +104,7 @@ IceInternal::Instance::defaultsAndOverrides() const
     return _defaultsAndOverrides;
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 RouterManagerPtr
 IceInternal::Instance::routerManager() const
@@ -121,7 +121,7 @@ IceInternal::Instance::routerManager() const
 
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 LocatorManagerPtr
 IceInternal::Instance::locatorManager() const
@@ -219,7 +219,7 @@ IceInternal::Instance::messageSizeMax() const
     return _messageSizeMax;
 }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 IceInternal::Instance::flushBatchRequests()
 {
@@ -410,11 +410,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	    const_cast<size_t&>(_threadPerConnectionStackSize) = static_cast<size_t>(stackSize);
 	}
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	_routerManager = new RouterManager;
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	_locatorManager = new LocatorManager;
 #endif
 
@@ -453,10 +453,10 @@ IceInternal::Instance::~Instance()
 #ifndef ICEE_PURE_CLIENT
     assert(!_objectAdapterFactory);
 #endif
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     assert(!_routerManager);
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     assert(!_locatorManager);
 #endif
     assert(!_endpointFactory);
@@ -486,7 +486,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     // initialization before the plug-in initialization!!! The proxies
     // might depend on endpoint factories to be installed by plug-ins.
     //
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     if(!_defaultsAndOverrides->defaultRouter.empty())
     {
 	_referenceFactory->setDefaultRouter(
@@ -494,7 +494,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     }
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(!_defaultsAndOverrides->defaultLocator.empty())
     {
 	_referenceFactory->setDefaultLocator(
@@ -584,7 +584,7 @@ IceInternal::Instance::destroy()
 	// _proxyFactory->destroy();
 	_proxyFactory = 0;
 	
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	if(_routerManager)
 	{
 	    _routerManager->destroy();
@@ -592,7 +592,7 @@ IceInternal::Instance::destroy()
 	}
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	if(_locatorManager)
 	{
 	    _locatorManager->destroy();
diff --git a/cppe/src/IceE/Instance.h b/cppe/src/IceE/Instance.h
index e2c2b06d1f3..6b6d190ee18 100644
--- a/cppe/src/IceE/Instance.h
+++ b/cppe/src/IceE/Instance.h
@@ -47,10 +47,10 @@ public:
     void logger(const Ice::LoggerPtr&);
     TraceLevelsPtr traceLevels() const;
     DefaultsAndOverridesPtr defaultsAndOverrides() const;
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterManagerPtr routerManager() const;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorManagerPtr locatorManager() const;
 #endif
     ReferenceFactoryPtr referenceFactory() const;
@@ -59,7 +59,7 @@ public:
     EndpointFactoryPtr endpointFactory() const;
     size_t messageSizeMax() const;
     Ice::Int connectionIdleTime() const;
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
     void setDefaultContext(const ::Ice::Context&);
@@ -85,10 +85,10 @@ private:
     const DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
     const size_t _messageSizeMax; // Immutable, not reset by destroy().
     const size_t _threadPerConnectionStackSize;
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterManagerPtr _routerManager;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorManagerPtr _locatorManager;
 #endif
     ReferenceFactoryPtr _referenceFactory;
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index d6bd9ed67e0..d414fa4b88b 100755
--- a/cppe/src/IceE/LocalException.cpp
+++ b/cppe/src/IceE/LocalException.cpp
@@ -434,7 +434,7 @@ Ice::ObjectAdapterIdInUseException::ice_throw() const
 string

 Ice::ObjectAdapterIdInUseException::toString() const

 {

-#ifndef ICEE_NO_LOCATOR

+#ifdef ICEE_HAS_LOCATOR

     string out = Exception::toString();

     out += ":\nobject adapter with id `";

     out += id; 

diff --git a/cppe/src/IceE/LocatorInfo.cpp b/cppe/src/IceE/LocatorInfo.cpp
index 71aee949d5e..0e367a18f4f 100644
--- a/cppe/src/IceE/LocatorInfo.cpp
+++ b/cppe/src/IceE/LocatorInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 #include <IceE/LocatorInfo.h>
 #include <IceE/Locator.h>
diff --git a/cppe/src/IceE/LocatorInfo.h b/cppe/src/IceE/LocatorInfo.h
index 8c4cf520170..7e093325bed 100644
--- a/cppe/src/IceE/LocatorInfo.h
+++ b/cppe/src/IceE/LocatorInfo.h
@@ -12,7 +12,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 #include <IceE/LocatorInfoF.h>
 #include <IceE/LocatorF.h>
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index 0a453d248d2..62a0e2eb598 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -19,11 +19,11 @@
 #include <IceE/LocalException.h>
 #include <IceE/Properties.h>
 #include <IceE/Functional.h>
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #    include <IceE/Endpoint.h>
@@ -88,7 +88,7 @@ Ice::ObjectAdapter::getCommunicator() const
 void
 Ice::ObjectAdapter::activate()
 {
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorRegistryPrx locatorRegistry;
 #endif
     bool printAdapterReady = false;
@@ -100,7 +100,7 @@ Ice::ObjectAdapter::activate()
 
 	if(!_printAdapterReadyDone)
 	{
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	    if(_locatorInfo && !_id.empty())
 	    {
 		locatorRegistry = _locatorInfo->getLocatorRegistry();
@@ -118,7 +118,7 @@ Ice::ObjectAdapter::activate()
     // We must call on the locator registry outside the thread
     // synchronization, to avoid deadlocks.
     //
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(locatorRegistry)
     {
 	//
@@ -444,7 +444,7 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const
 void
 Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 {
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     Ice::Monitor<Ice::RecMutex>::Lock sync(*this);
     
     checkForDeactivation();
@@ -484,7 +484,7 @@ Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 void
 Ice::ObjectAdapter::setLocator(const LocatorPrx& locator)
 {
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     Ice::Monitor<Ice::RecMutex>::Lock sync(*this);
     
     checkForDeactivation();
@@ -503,7 +503,7 @@ Ice::ObjectAdapter::isLocal(const ObjectPrx& proxy) const
     ReferencePtr ref = proxy->__reference();
     vector<EndpointPtr>::const_iterator p;
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(ref);
     if(ir)
     {
@@ -542,7 +542,7 @@ Ice::ObjectAdapter::isLocal(const ObjectPrx& proxy) const
     // router's server proxy endpoints (if any), are also considered
     // local.
     //
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     for(p = endpoints.begin(); p != endpoints.end(); ++p)
     {
 	if(binary_search(_routerEndpoints.begin(), _routerEndpoints.end(), *p)) // _routerEndpoints is sorted.
@@ -641,7 +641,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato
 	endpts = _instance->properties()->getProperty(name + ".PublishedEndpoints");
 	_publishedEndpoints = parseEndpoints(endpts);
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	string router = _instance->properties()->getProperty(_name + ".Router");
 	if(!router.empty())
 	{
@@ -649,7 +649,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato
 	}
 #endif
 	
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	string locator = _instance->properties()->getProperty(_name + ".Locator");
 	if(!locator.empty())
 	{
@@ -696,12 +696,12 @@ Ice::ObjectAdapter::~ObjectAdapter()
 ObjectPrx
 Ice::ObjectAdapter::newProxy(const Identity& ident, const string& facet) const
 {
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(_id.empty())
     {
 #endif
 	return newDirectProxy(ident, facet);
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     }
     else
     {
@@ -710,7 +710,7 @@ Ice::ObjectAdapter::newProxy(const Identity& ident, const string& facet) const
 	//
 	ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet,
 								 Reference::ModeTwoway, _id
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 								 , 0
 #endif
 								 , _locatorInfo
@@ -748,7 +748,7 @@ Ice::ObjectAdapter::newDirectProxy(const Identity& ident, const string& facet) c
     // any. This way, object references created by this object adapter
     // will also point to the router's server proxy endpoints.
     //
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     copy(_routerEndpoints.begin(), _routerEndpoints.end(), back_inserter(endpoints));
 #endif
     
@@ -757,7 +757,7 @@ Ice::ObjectAdapter::newDirectProxy(const Identity& ident, const string& facet) c
     //
     ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway,
 							     endpoints
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 							     , 0
 #endif
 							     );
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index 15544e45aee..fadd564fd90 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -51,7 +51,7 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
 	    break;
 	}
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 	case Reference::ModeBatchOneway:
 	{
 	    _connection->prepareBatchRequest(&_os);
@@ -230,7 +230,7 @@ IceInternal::Outgoing::invoke()
 	    break;
 	}
 
-#ifndef ICEE_NO_BATCH

+#ifdef ICEE_HAS_BATCH

 	case Reference::ModeBatchOneway:
 	{
 	    //
@@ -258,7 +258,7 @@ IceInternal::Outgoing::abort(const LocalException& ex)
     // notify the connection about that we give up ownership of the
     // batch stream.
     //
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     if(_reference->getMode() == Reference::ModeBatchOneway)
     {
 	_connection->abortBatchRequest();
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp
index 247dd26d8fc..e6ebcbfe69c 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.cpp
+++ b/cppe/src/IceE/OutgoingConnectionFactory.cpp
@@ -18,7 +18,7 @@
 #include <IceE/RouterInfo.h>
 #include <IceE/LocalException.h>
 #include <IceE/Functional.h>
-#ifndef ICEE_NO_ROUTER

+#ifdef ICEE_HAS_ROUTER

 #  include <IceE/Reference.h>

 #endif
 #include <list>
@@ -328,7 +328,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpts
     return connection;
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 void
 IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
@@ -388,7 +388,7 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 
 #endif
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 IceInternal::OutgoingConnectionFactory::flushBatchRequests()
 {
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h
index a29d398e829..a9196150994 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.h
+++ b/cppe/src/IceE/OutgoingConnectionFactory.h
@@ -34,11 +34,11 @@ public:
     void waitUntilFinished();
 
     Ice::ConnectionPtr create(const std::vector<EndpointPtr>&);
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     void setRouter(const ::Ice::RouterPrx&);
 #endif
     void removeAdapter(const ::Ice::ObjectAdapterPtr&);
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 7f82df287fb..8bca4ad0848 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -14,7 +14,7 @@
 #include <IceE/Instance.h>
 #include <IceE/BasicStream.h>
 #include <IceE/LocalException.h>
-#ifndef ICEE_NO_ROUTER

+#ifdef ICEE_HAS_ROUTER

 #  include <IceE/RouterInfo.h>

 #endif

 
@@ -429,7 +429,7 @@ IceProxy::Ice::Object::ice_isOneway() const
     return _reference->getMode() == Reference::ModeOneway;
 }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 ObjectPrx
 IceProxy::Ice::Object::ice_batchOneway() const
 {
@@ -469,7 +469,7 @@ IceProxy::Ice::Object::ice_timeout(int t) const
     }
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 ObjectPrx
 IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
@@ -489,7 +489,7 @@ IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
 
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 ObjectPrx
 IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
@@ -652,7 +652,7 @@ IceProxy::Ice::Object::__getDelegate()
 	// using a router, then add this proxy to the router info
 	// object.
 	//
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	RoutableReferencePtr rr = RoutableReferencePtr::dynamicCast(_reference);
 	if(rr && rr->getRouterInfo())
 	{
diff --git a/cppe/src/IceE/ProxyFactory.cpp b/cppe/src/IceE/ProxyFactory.cpp
index 0b79cc5ea26..c8280586099 100644
--- a/cppe/src/IceE/ProxyFactory.cpp
+++ b/cppe/src/IceE/ProxyFactory.cpp
@@ -96,7 +96,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co
     // indirect. Otherwise, we don't retry other *NotExistException,
     // which are all derived from RequestFailedException.
     //
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(dynamic_cast<const ObjectNotExistException*>(&ex))
     {
 	IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(ref);
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index ec31eaa4225..64922f8ab1f 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -14,12 +14,12 @@
 #include <IceE/IdentityUtil.h>
 #include <IceE/Endpoint.h>
 #include <IceE/BasicStream.h>
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #    include <IceE/Connection.h>

 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
@@ -251,7 +251,7 @@ IceInternal::Reference::toString() const
 	    break;
 	}
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 	case ModeBatchOneway:
 	{
 	    s += " -O";
@@ -405,7 +405,7 @@ IceInternal::FixedReference::getEndpoints() const
     return vector<EndpointPtr>();
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 ReferencePtr
 IceInternal::FixedReference::changeRouter(const RouterPrx&) const
@@ -415,7 +415,7 @@ IceInternal::FixedReference::changeRouter(const RouterPrx&) const
 
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::FixedReference::changeLocator(const LocatorPrx&) const
@@ -519,7 +519,7 @@ IceInternal::FixedReference::FixedReference(const FixedReference& r)
 void IceInternal::incRef(IceInternal::RoutableReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::RoutableReference* p) { p->__decRef(); }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 vector<EndpointPtr>
 IceInternal::RoutableReference::getRoutedEndpoints() const
@@ -572,7 +572,7 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
     {
         return false;
     }
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     return _routerInfo == rhs->_routerInfo;
 #else
     return true;
@@ -601,7 +601,7 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
         const RoutableReference* rhs = dynamic_cast<const RoutableReference*>(&r);
         if(rhs)
         {
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
             return _routerInfo < rhs->_routerInfo;
 #else
 	    return true;
@@ -613,12 +613,12 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
 
 IceInternal::RoutableReference::RoutableReference(const InstancePtr& inst, const Identity& ident,
 						  const Context& ctx, const string& fs, Mode md
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 						  , const RouterInfoPtr& rtrInfo
 #endif
 						  )
     : Reference(inst, ident, ctx, fs, md)
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
       , _routerInfo(rtrInfo)
 #endif
 {
@@ -626,7 +626,7 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& inst, const
 
 IceInternal::RoutableReference::RoutableReference(const RoutableReference& r)
     : Reference(r)
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
       , _routerInfo(r._routerInfo)
 #endif
 {
@@ -638,12 +638,12 @@ void IceInternal::decRef(IceInternal::DirectReference* p) { p->__decRef(); }
 IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const Identity& ident,
 					      const Context& ctx, const string& fs, Mode md,
 					      const vector<EndpointPtr>& endpts
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 					      , const RouterInfoPtr& rtrInfo
 #endif
 					      )
     : RoutableReference(inst, ident, ctx, fs, md
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     			, rtrInfo
 #endif
 			),
@@ -675,26 +675,26 @@ IceInternal::DirectReference::changeDefault() const
     //
     // Return an indirect reference if a default locator is set.
     //
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
     if(loc)
     {
 	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc);
 	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway,
 							 ""
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 							 , 0
-#endif // ICEE_NO_ROUTER
+#endif // ICEE_HAS_ROUTER
 							 , newLocatorInfo);
     }
     else
-#endif // ICEE_NO_LOCATOR
+#endif // ICEE_HAS_LOCATOR
     {
 	return RoutableReference::changeDefault();
     }
 }
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::DirectReference::changeLocator(const LocatorPrx& newLocator) const
@@ -704,7 +704,7 @@ IceInternal::DirectReference::changeLocator(const LocatorPrx& newLocator) const
 	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
 	return getInstance()->referenceFactory()->create(getIdentity(), getContext(), getFacet(), getMode(),
 							 ""
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 							 , 0
 #endif
 							 , newLocatorInfo);
@@ -772,7 +772,7 @@ IceInternal::DirectReference::toString() const
 ConnectionPtr
 IceInternal::DirectReference::getConnection() const
 {
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     vector<EndpointPtr> endpts = RoutableReference::getRoutedEndpoints();
     if(endpts.empty())
     {
@@ -798,7 +798,7 @@ IceInternal::DirectReference::getConnection() const
     // (if any) to the new connection, so that callbacks from the
     // router can be received over this new connection.
     //
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     if(getRouterInfo())
     {
         connection->setAdapter(getRouterInfo()->getAdapter());
@@ -864,7 +864,7 @@ IceInternal::DirectReference::DirectReference(const DirectReference& r)
 {
 }
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 void IceInternal::incRef(IceInternal::IndirectReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::IndirectReference* p) { p->__decRef(); }
@@ -872,12 +872,12 @@ void IceInternal::decRef(IceInternal::IndirectReference* p) { p->__decRef(); }
 IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const Identity& ident,
                                                   const Context& ctx, const string& fs, Mode md,
 						  const string& adptid
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 						  , const RouterInfoPtr& rtrInfo
 #endif
 						  , const LocatorInfoPtr& locInfo)
     : RoutableReference(inst, ident, ctx, fs, md
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
      		  	, rtrInfo
 #endif
 			),
@@ -903,7 +903,7 @@ IceInternal::IndirectReference::changeDefault() const
     {
 	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway,
 							 vector<EndpointPtr>()
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 							 , getRouterInfo()
 #endif
 							 );
@@ -926,7 +926,7 @@ IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) cons
     {
 	return getInstance()->referenceFactory()->create(getIdentity(), getContext(), getFacet(), getMode(),
 							 vector<EndpointPtr>()
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 							 , getRouterInfo()
 #endif
 							 );
@@ -1002,7 +1002,7 @@ IceInternal::IndirectReference::getConnection() const
 
     while(true)
     {
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	vector<EndpointPtr> endpts = RoutableReference::getRoutedEndpoints();
 #else
 	vector<EndpointPtr> endpts;
@@ -1029,7 +1029,7 @@ IceInternal::IndirectReference::getConnection() const
 	}
 	catch(const LocalException& ex)
 	{
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	    if(!getRouterInfo())
 #endif
 	    {
@@ -1062,7 +1062,7 @@ IceInternal::IndirectReference::getConnection() const
     // (if any) to the new connection, so that callbacks from the
     // router can be received over this new connection.
     //
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     if(getRouterInfo())
     {
         connection->setAdapter(getRouterInfo()->getAdapter());
@@ -1137,7 +1137,7 @@ IceInternal::IndirectReference::IndirectReference(const IndirectReference& r)
 {
 }
 
-#endif // ICEE_NO_LOCATOR
+#endif // ICEE_HAS_LOCATOR
 
 vector<EndpointPtr>
 IceInternal::filterEndpoints(const vector<EndpointPtr>& allEndpoints)
diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h
index 2e69a303353..bbba3be8af0 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -13,11 +13,11 @@
 #include <IceE/ReferenceF.h>
 #include <IceE/EndpointF.h>
 #include <IceE/InstanceF.h>
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #  include <IceE/RouterInfoF.h>
 #  include <IceE/RouterF.h>
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #  include <IceE/LocatorInfoF.h>
 #  include <IceE/LocatorF.h>
 #endif
@@ -69,10 +69,10 @@ public:
     //
     virtual ReferencePtr changeDefault() const;
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
 #endif
     virtual ReferencePtr changeTimeout(int) const = 0;
@@ -131,10 +131,10 @@ public:
 
     virtual std::vector<EndpointPtr> getEndpoints() const;
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
 #endif
     virtual ReferencePtr changeTimeout(int) const;
@@ -162,7 +162,7 @@ class RoutableReference : public Reference
 {
 public:
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     const RouterInfoPtr& getRouterInfo() const { return _routerInfo; }
     std::vector<EndpointPtr> getRoutedEndpoints() const;
 
@@ -182,7 +182,7 @@ public:
 protected:
 
     RoutableReference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&, Mode
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		      , const RouterInfoPtr&
 #endif
 		      );
@@ -191,7 +191,7 @@ protected:
 
 private:
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterInfoPtr _routerInfo; // Null if no router is used.
 #endif
 };
@@ -202,7 +202,7 @@ public:
 
     DirectReference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&, Mode,
 	            const std::vector<EndpointPtr>&
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		    , const RouterInfoPtr&
 #endif
 		    );
@@ -213,7 +213,7 @@ public:
 
     virtual ReferencePtr changeDefault() const;
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
 #endif
     virtual ReferencePtr changeTimeout(int) const;
@@ -237,7 +237,7 @@ private:
     std::vector<EndpointPtr> _endpoints;
 };
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 class IndirectReference : public RoutableReference
 {
@@ -245,7 +245,7 @@ public:
 
     IndirectReference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&,
                       Mode, const std::string&
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		      , const RouterInfoPtr&
 #endif
 		      , const LocatorInfoPtr&);
@@ -280,7 +280,7 @@ private:
     LocatorInfoPtr _locatorInfo;
 };
 
-#endif // ICEE_NO_LOCATOR
+#endif // ICEE_HAS_LOCATOR
 
 std::vector<EndpointPtr> filterEndpoints(const std::vector<EndpointPtr>&);
 
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index 6482774f503..894b563272f 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -12,10 +12,10 @@
 #include <IceE/Instance.h>
 #include <IceE/IdentityUtil.h>
 #include <IceE/EndpointFactory.h>
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #  include <IceE/RouterInfo.h>
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #  include <IceE/LocatorInfo.h>
 #endif
 #include <IceE/BasicStream.h>
@@ -53,7 +53,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 				      const string& facet,
 				      Reference::Mode mode,
 				      const vector<EndpointPtr>& endpoints
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      )
@@ -74,13 +74,13 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     // Create new reference
     //
     return new DirectReference(_instance, ident, context, facet, mode, endpoints
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     			       , routerInfo
 #endif
 			       );
 }
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
@@ -88,7 +88,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 				      const string& facet,
 				      Reference::Mode mode,
 				      const string& adapterId
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      , const LocatorInfoPtr& locatorInfo)
@@ -110,7 +110,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     return new IndirectReference(_instance, ident, context, facet, mode,
 				 adapterId
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 				 , routerInfo
 #endif
 				 , locatorInfo);
@@ -357,7 +357,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 		break;
 	    }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 	    case 'O':
 	    {
 		if(!argument.empty())
@@ -380,18 +380,18 @@ IceInternal::ReferenceFactory::create(const string& str)
 	}
     }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterInfoPtr routerInfo = _instance->routerManager()->get(getDefaultRouter());
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 #endif
 
     if(beg == string::npos)
     {
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	return create(ident, Context(), facet, mode, ""
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		     , routerInfo
 #endif
 		     , locatorInfo
@@ -426,13 +426,13 @@ IceInternal::ReferenceFactory::create(const string& str)
 		endpoints.push_back(endp);
 	    }
 	    return create(ident, Context(), facet, mode, endpoints
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	    		  , routerInfo
 #endif
 			  );
 	    break;
 	}
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	case '@':
 	{
 	    beg = s.find_first_not_of(delim, beg + 1);
@@ -470,7 +470,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 		throw ex;
 	    }
 	    return create(ident, Context(), facet, mode, adapter
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	    		  , routerInfo
 #endif
 			  , locatorInfo
@@ -526,10 +526,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     vector<EndpointPtr> endpoints;
     string adapterId;
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterInfoPtr routerInfo = _instance->routerManager()->get(getDefaultRouter());
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 #endif
 
@@ -545,17 +545,17 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	    endpoints.push_back(endpoint);
 	}
 	return create(ident, Context(), facet, mode, endpoints
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		      , routerInfo
 #endif
 		      );
     }
     else
     {
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	s->read(adapterId);
 	return create(ident, Context(), facet, mode, adapterId
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		      , routerInfo
 #endif
 		      , locatorInfo
@@ -566,7 +566,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     }
 }
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 void
 IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
@@ -584,7 +584,7 @@ IceInternal::ReferenceFactory::getDefaultRouter() const
 
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 void
 IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
@@ -618,10 +618,10 @@ IceInternal::ReferenceFactory::destroy()
     }
 
     _instance = 0;
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     _defaultRouter = 0;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     _defaultLocator = 0;
 #endif
 }
diff --git a/cppe/src/IceE/ReferenceFactory.h b/cppe/src/IceE/ReferenceFactory.h
index a1a03a83a90..ee1ea1535c2 100644
--- a/cppe/src/IceE/ReferenceFactory.h
+++ b/cppe/src/IceE/ReferenceFactory.h
@@ -33,17 +33,17 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
 			Reference::Mode, const ::std::vector<EndpointPtr>&
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			);
     //
     // Create an indirect reference.
     //
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     ReferencePtr create(const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
 			Reference::Mode, const ::std::string&
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			, const LocatorInfoPtr&);
@@ -64,12 +64,12 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, BasicStream*);
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     void setDefaultRouter(const ::Ice::RouterPrx&);
     ::Ice::RouterPrx getDefaultRouter() const;
 #endif
 
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     void setDefaultLocator(const ::Ice::LocatorPrx&);
     ::Ice::LocatorPrx getDefaultLocator() const;
 #endif
@@ -81,10 +81,10 @@ private:
     friend class Instance;
 
     InstancePtr _instance;
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
     ::Ice::RouterPrx _defaultRouter;
 #endif
-#ifndef ICEE_NO_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     ::Ice::LocatorPrx _defaultLocator;
 #endif
 };
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index 444702b7147..a738e75b905 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/RouterInfo.h>
 #include <IceE/Router.h>
diff --git a/cppe/src/IceE/RouterInfo.h b/cppe/src/IceE/RouterInfo.h
index 0f2358e448d..d646363d59f 100644
--- a/cppe/src/IceE/RouterInfo.h
+++ b/cppe/src/IceE/RouterInfo.h
@@ -12,7 +12,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/RouterInfoF.h>
 #include <IceE/RouterF.h>
diff --git a/cppe/src/IceE/RouterInfoF.h b/cppe/src/IceE/RouterInfoF.h
index 82abdb6a516..a5552815fb2 100644
--- a/cppe/src/IceE/RouterInfoF.h
+++ b/cppe/src/IceE/RouterInfoF.h
@@ -12,7 +12,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index f5fadca71eb..c63a646ceab 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifndef ICEE_NO_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/RoutingTable.h>
 #include <IceE/Proxy.h>
diff --git a/cppe/src/IceE/TraceUtil.cpp b/cppe/src/IceE/TraceUtil.cpp
index 6f6711f7ea5..550ebb21fe6 100644
--- a/cppe/src/IceE/TraceUtil.cpp
+++ b/cppe/src/IceE/TraceUtil.cpp
@@ -245,7 +245,7 @@ IceInternal::traceRequest(const char* heading, const BasicStream& str, const Log
     }
 }
 
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			       const TraceLevelsPtr& tl)
diff --git a/cppe/src/IceE/TraceUtil.h b/cppe/src/IceE/TraceUtil.h
index 71595767fba..e6f5d5b8ff1 100644
--- a/cppe/src/IceE/TraceUtil.h
+++ b/cppe/src/IceE/TraceUtil.h
@@ -20,7 +20,7 @@ class BasicStream;
 
 void traceHeader(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
 void traceBatchRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 #endif
 void traceReply(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);