diff options
75 files changed, 9 insertions, 621 deletions
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp index a98f0d952bb..98e800e0106 100644 --- a/cpp/demo/Freeze/library/Parser.cpp +++ b/cpp/demo/Freeze/library/Parser.cpp @@ -171,9 +171,6 @@ Parser::printCurrent() string renter; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif renter = (*_current)->getRenterName(); } catch(const BookNotRentedException&) diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index 5063e1ea408..6d56adf2765 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -77,9 +77,6 @@ CallbackClient::createSession() try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif router()->createSession(id, pw); break; } diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp index 7b4b375303d..58ef0cd6e3f 100644 --- a/cpp/demo/Glacier2/chat/Client.cpp +++ b/cpp/demo/Glacier2/chat/Client.cpp @@ -117,9 +117,6 @@ public: try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session = ChatSessionPrx::uncheckedCast(_router->createSession(id, pw)); break; } diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp index 7bd1f562fbc..0de09584229 100644 --- a/cpp/demo/IceGrid/allocate/Client.cpp +++ b/cpp/demo/IceGrid/allocate/Client.cpp @@ -132,9 +132,6 @@ HelloClient::run(int argc, char* argv[]) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session = registry->createSession(id, password); break; } @@ -158,9 +155,6 @@ HelloClient::run(int argc, char* argv[]) HelloPrx hello; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif hello = HelloPrx::checkedCast(session->allocateObjectById(communicator()->stringToIdentity("hello"))); } catch(const IceGrid::ObjectNotRegisteredException&) diff --git a/cpp/demo/IceGrid/secure/Client.cpp b/cpp/demo/IceGrid/secure/Client.cpp index 871f0f08a65..450b7bf773a 100644 --- a/cpp/demo/IceGrid/secure/Client.cpp +++ b/cpp/demo/IceGrid/secure/Client.cpp @@ -59,9 +59,6 @@ HelloClient::run(int argc, char* argv[]) HelloPrx hello; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello")); } catch(const Ice::NotRegisteredException&) diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp index f93a811864e..d90277968f0 100644 --- a/cpp/demo/IceGrid/sessionActivation/Client.cpp +++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp @@ -131,9 +131,6 @@ HelloClient::run(int argc, char* argv[]) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session = registry->createSession(id, password); break; } diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp index 871f0f08a65..450b7bf773a 100644 --- a/cpp/demo/IceGrid/simple/Client.cpp +++ b/cpp/demo/IceGrid/simple/Client.cpp @@ -59,9 +59,6 @@ HelloClient::run(int argc, char* argv[]) HelloPrx hello; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello")); } catch(const Ice::NotRegisteredException&) diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp index 74f13ebef61..c341212c100 100644 --- a/cpp/demo/IceStorm/clock/Publisher.cpp +++ b/cpp/demo/IceStorm/clock/Publisher.cpp @@ -98,18 +98,12 @@ Publisher::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve(topicName); } catch(const IceStorm::NoSuchTopic&) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->create(topicName); } catch(const IceStorm::TopicExists&) diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp index 5a12c8cf23b..2461892bd3b 100644 --- a/cpp/demo/IceStorm/clock/Subscriber.cpp +++ b/cpp/demo/IceStorm/clock/Subscriber.cpp @@ -161,18 +161,12 @@ Subscriber::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve(topicName); } catch(const IceStorm::NoSuchTopic&) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->create(topicName); } catch(const IceStorm::TopicExists&) diff --git a/cpp/demo/IceStorm/counter/Server.cpp b/cpp/demo/IceStorm/counter/Server.cpp index a2f46c263ed..66309878007 100644 --- a/cpp/demo/IceStorm/counter/Server.cpp +++ b/cpp/demo/IceStorm/counter/Server.cpp @@ -53,9 +53,6 @@ Server::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve("counter"); } catch(const IceStorm::NoSuchTopic&) diff --git a/cpp/demo/IceStorm/replicated/Publisher.cpp b/cpp/demo/IceStorm/replicated/Publisher.cpp index 74f13ebef61..c341212c100 100644 --- a/cpp/demo/IceStorm/replicated/Publisher.cpp +++ b/cpp/demo/IceStorm/replicated/Publisher.cpp @@ -98,18 +98,12 @@ Publisher::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve(topicName); } catch(const IceStorm::NoSuchTopic&) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->create(topicName); } catch(const IceStorm::TopicExists&) diff --git a/cpp/demo/IceStorm/replicated/Subscriber.cpp b/cpp/demo/IceStorm/replicated/Subscriber.cpp index d4b6cfdf1a5..523a1c02440 100644 --- a/cpp/demo/IceStorm/replicated/Subscriber.cpp +++ b/cpp/demo/IceStorm/replicated/Subscriber.cpp @@ -161,18 +161,12 @@ Subscriber::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve(topicName); } catch(const IceStorm::NoSuchTopic&) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->create(topicName); } catch(const IceStorm::TopicExists&) diff --git a/cpp/demo/IceStorm/replicated2/Subscriber.cpp b/cpp/demo/IceStorm/replicated2/Subscriber.cpp index ae8f0a8cdf2..bf235ab47c3 100644 --- a/cpp/demo/IceStorm/replicated2/Subscriber.cpp +++ b/cpp/demo/IceStorm/replicated2/Subscriber.cpp @@ -161,9 +161,6 @@ Subscriber::run(int argc, char* argv[]) IceStorm::TopicPrx topic; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif topic = manager->retrieve(topicName); } catch(const IceStorm::NoSuchTopic&) diff --git a/cpp/demo/book/lifecycle/Parser.cpp b/cpp/demo/book/lifecycle/Parser.cpp index 153490cb50c..cb4c3411d97 100644 --- a/cpp/demo/book/lifecycle/Parser.cpp +++ b/cpp/demo/book/lifecycle/Parser.cpp @@ -174,9 +174,6 @@ Parser::cd(const string& name) NodeDesc d; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif d = dir->find(name); } catch(const NoSuchName&) diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index b528837369c..3c4e8ad2871 100644 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -157,9 +157,6 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp index 28d12bebd41..2e24f9d88dd 100644 --- a/cpp/src/FreezeScript/Parser.cpp +++ b/cpp/src/FreezeScript/Parser.cpp @@ -166,11 +166,7 @@ FreezeScript::EvaluateException::ice_name() const void FreezeScript::EvaluateException::ice_print(ostream& out) const { -#ifdef __BCPLUSPLUS__ Ice::Exception::ice_print(out); -#else - Exception::ice_print(out); -#endif out << ":\nerror occurred while evaluating expression"; if(!_reason.empty()) { diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index 5865a89f6f5..060b7b7a26f 100644 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -256,9 +256,6 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 81f0e9d063e..b86bc645cef 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -105,9 +105,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) @@ -199,9 +196,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = communicator()->propertyToProxy(verifierProperty); } catch(const Ice::ProxyParseException&) @@ -240,9 +234,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif verifier = PermissionsVerifierPrx::checkedCast(obj); if(!verifier) { @@ -311,9 +302,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) ObjectPrx obj; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = communicator()->propertyToProxy(sessionManagerProperty); } catch(const Ice::Exception& ex) @@ -325,9 +313,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif sessionManager = SessionManagerPrx::checkedCast(obj); if(!sessionManager) { @@ -367,9 +352,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = communicator()->propertyToProxy(sslVerifierProperty); } catch(const Ice::ProxyParseException&) @@ -410,9 +392,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif sslVerifier = SSLPermissionsVerifierPrx::checkedCast(obj); if(!sslVerifier) { @@ -445,9 +424,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) ObjectPrx obj; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = communicator()->propertyToProxy(sslSessionManagerProperty); } catch(const Ice::Exception& ex) @@ -459,9 +435,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif sslSessionManager = SSLSessionManagerPrx::checkedCast(obj); if(!sslSessionManager) { @@ -496,9 +469,6 @@ Glacier2::RouterService::start(int argc, char* argv[]) // try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif _instance = new Instance(communicator(), clientAdapter, serverAdapter); } catch(const Ice::InitializationException& ex) diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index ca7996ef912..25b91c92805 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1107,9 +1107,6 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector() Ice::ConnectionIPtr connection; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif assert(_iter != _connectors.end()); connection = _factory->createConnection(_iter->connector->connect(), *_iter); connection->start(this); diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 76d9912a85c..4dc933b0838 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -118,9 +118,9 @@ SDIR = $(slicedir)\Ice CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib
-!if "$(BCPLUSPLUS)" != "yes"
+#!if "$(BCPLUSPLUS)" != "yes"
LINKWITH = $(LINKWITH) Iphlpapi.lib
-!endif
+#!endif
!if "$(BCPLUSPLUS)" == "yes"
RES_FILE = ,, Ice.res
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 614cabbc6e7..fa16f33d4ea 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -390,8 +390,6 @@ getInterfaceIndex(const string& name) { int index = 0; #ifdef _WIN32 - -#ifndef __BCPLUSPLUS__ IP_ADAPTER_ADDRESSES addrs; ULONG buflen = 0; if(::GetAdaptersAddresses(AF_INET6, 0, 0, &addrs, &buflen) == ERROR_BUFFER_OVERFLOW) @@ -413,8 +411,6 @@ getInterfaceIndex(const string& name) } delete[] buf; } -#endif - #elif !defined(__hpux) index = if_nametoindex(name.c_str()); #endif @@ -427,8 +423,6 @@ getInterfaceAddress(const string& name) struct in_addr addr; addr.s_addr = INADDR_ANY; #ifdef _WIN32 - -#ifndef __BCPLUSPLUS__ IP_ADAPTER_ADDRESSES addrs; ULONG buflen = 0; if(::GetAdaptersAddresses(AF_INET, 0, 0, &addrs, &buflen) == ERROR_BUFFER_OVERFLOW) @@ -453,8 +447,6 @@ getInterfaceAddress(const string& name) } delete[] buf; } -#endif - #else ifreq if_address; strcpy(if_address.ifr_name, name.c_str()); diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp index 458c7b4e702..8637a3b1936 100644 --- a/cpp/src/Ice/Protocol.cpp +++ b/cpp/src/Ice/Protocol.cpp @@ -14,11 +14,7 @@ namespace IceInternal const Ice::Byte magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P' -#ifdef __BCPLUSPLUS__ -const Ice::Byte requestHdr[headerSize + sizeof(Ice::Int)] = -#else const Ice::Byte requestHdr[] = -#endif { magic[0], magic[1], @@ -34,11 +30,7 @@ const Ice::Byte requestHdr[] = 0, 0, 0, 0 // Request id (placeholder) }; -#ifdef __BCPLUSPLUS__ -const Ice::Byte requestBatchHdr[headerSize + sizeof(Ice::Int)] = -#else const Ice::Byte requestBatchHdr[] = -#endif { magic[0], magic[1], diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 69a3efcabf7..d8cbf2894f7 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -122,9 +122,6 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context) Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __checkTwowayOnly(ice_isA_name); __del = __getDelegate(false); return __del->ice_isA(typeId, context); @@ -149,9 +146,6 @@ IceProxy::Ice::Object::ice_ping(const Context* context) Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __del = __getDelegate(false); __del->ice_ping(context); return; @@ -176,9 +170,6 @@ IceProxy::Ice::Object::ice_ids(const Context* context) Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __checkTwowayOnly(ice_ids_name); __del = __getDelegate(false); return __del->ice_ids(context); @@ -203,9 +194,6 @@ IceProxy::Ice::Object::ice_id(const Context* context) Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __checkTwowayOnly(ice_id_name); __del = __getDelegate(false); return __del->ice_id(context); @@ -256,9 +244,6 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __del = __getDelegate(false); return __del->ice_invoke(operation, mode, inParams, outParams, context); } @@ -773,9 +758,6 @@ IceProxy::Ice::Object::ice_getConnection() Handle< ::IceDelegate::Ice::Object> __del; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __del = __getDelegate(false); return __del->__getRequestHandler()->getConnection(true); // Wait for the connection to be established. @@ -820,9 +802,6 @@ IceProxy::Ice::Object::ice_flushBatchRequests() int __cnt = -1; // Don't retry. try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif __del = __getDelegate(false); __del->ice_flushBatchRequests(); } @@ -916,9 +895,6 @@ IceProxy::Ice::Object::__handleException(const ::IceInternal::Handle< ::IceDeleg try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif _reference->getInstance()->proxyFactory()->checkRetryAfterException(ex, _reference, out, cnt); } catch(const CommunicatorDestroyedException&) diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 789cd08d94a..a30a7079b45 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -362,9 +362,6 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy) // try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif clientProxy = clientProxy->ice_timeout(_router->ice_getConnection()->timeout()); } catch(const Ice::CollocationOptimizationException&) diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index 4200764b081..d5720aa222e 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -390,9 +390,6 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa InitializationData initData = initializationData; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter); } catch(const Ice::Exception& ex) diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index 6cd3076b995..2a77a8629ba 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -58,9 +58,6 @@ Client::run(int argc, char* argv[]) vector<string> commands; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif commands = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp index 1245ab56b8f..3d6f4eb4dda 100644 --- a/cpp/src/IceBox/Exception.cpp +++ b/cpp/src/IceBox/Exception.cpp @@ -15,11 +15,7 @@ using namespace std; void IceBox::FailureException::ice_print(ostream& out) const { -#ifdef __BCPLUSPLUS__ - Ice::Exception::ice_print(out); -#else Exception::ice_print(out); -#endif out << ":\nservice failure exception: " << reason; } diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp index c98d593636d..2cfb70ce1ea 100644 --- a/cpp/src/IceBox/Service.cpp +++ b/cpp/src/IceBox/Service.cpp @@ -72,9 +72,6 @@ IceBox::IceBoxService::start(int argc, char* argv[]) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(args); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 7833bc9e956..24e8a723e99 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -598,9 +598,6 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, SERVICE_FACTORY factory = (SERVICE_FACTORY)sym; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif info.service = factory(_communicator); } catch(const Exception& ex) diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index cec27811315..af24d9da061 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -276,9 +276,6 @@ ServerAdapterEntry::getAdapterInfo() const info.replicaGroupId = _replicaGroupId; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif info.proxy = _server->getAdapter(_id, true)->getDirectProxy(); } catch(const Ice::Exception&) diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index e975172743d..ad68747e51a 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -329,9 +329,6 @@ Client::run(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 245f8a88ba0..c97a03142cf 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -20,13 +20,6 @@ #include <IceGrid/NodeI.h> #include <IceGrid/NodeSessionManager.h> #include <IceGrid/TraceLevels.h> -#ifdef __BCPLUSPLUS__ -# include <IceGrid/ServerI.h> -# include <IceGrid/AdminSessionI.h> -# include <IceGrid/ReapThread.h> -# include <IceGrid/Database.h> -# include <IceGrid/WellKnownObjectsManager.h> -#endif #include <IceGrid/DescriptorParser.h> #include <IcePatch2/Util.h> #ifdef QTSQL diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index 8b41caea87f..060ca8883ab 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -12,12 +12,6 @@ #include <Ice/Service.h> #include <IceGrid/RegistryI.h> #include <IceGrid/TraceLevels.h> -#ifdef __BCPLUSPLUS__ -# include <IceGrid/AdminSessionI.h> -# include <IceGrid/ReapThread.h> -# include <IceGrid/Database.h> -# include <IceGrid/WellKnownObjectsManager.h> -#endif #ifdef QTSQL # include <IceSQL/SqlTypes.h> # include <QtCore/QCoreApplication> @@ -97,9 +91,6 @@ RegistryService::start(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 2db95739e9a..e088270221c 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -653,9 +653,6 @@ LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb, Ice::ObjectPrx proxy; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif proxy = _database->getObjectProxy(id); } catch(const ObjectNotRegisteredException&) @@ -746,9 +743,6 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb, try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif cb->ice_response(_database->getAdapterDirectProxy(id)); } catch(const AdapterNotExistException&) diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 5119528026d..4911b4205da 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -548,9 +548,6 @@ NodeI::destroyServer_async(const AMD_Node_destroyServerPtr& amdCB, // try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif command = server->destroy(amdCB, uuid, revision, replicaName); } catch(const Ice::ObjectNotExistException&) diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 4424e748a8d..b8c19ab9a58 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -1050,9 +1050,6 @@ RegistryI::getPermissionsVerifier(const ObjectAdapterPtr& adapter, { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif verifier = _communicator->propertyToProxy(verifierProperty); } catch(const ProxyParseException&) @@ -1135,9 +1132,6 @@ RegistryI::getPermissionsVerifier(const ObjectAdapterPtr& adapter, Glacier2::PermissionsVerifierPrx verifierPrx; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif // // Set the permission verifier proxy locator to the internal // locator. We can't use the "public" locator, this could lead @@ -1179,9 +1173,6 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif verifier = _communicator->propertyToProxy(verifierProperty); } catch(const ProxyParseException&) @@ -1225,9 +1216,6 @@ RegistryI::getSSLPermissionsVerifier(const IceGrid::LocatorPrx& locator, const s Glacier2::SSLPermissionsVerifierPrx verifierPrx; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif // // Set the permission verifier proxy locator to the internal // locator. We can't use the "public" locator, this could lead diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp index 71dd2cd4f67..24de0a6a157 100644 --- a/cpp/src/IceGrid/SessionServantManager.cpp +++ b/cpp/src/IceGrid/SessionServantManager.cpp @@ -12,10 +12,6 @@ #include <Ice/ObjectAdapter.h> #include <IceGrid/SessionServantManager.h> -#if defined(__BCPLUSPLUS__) -# include <iterator> -#endif - using namespace std; using namespace IceGrid; diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index 5212f671236..2755afdec0f 100644 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -13,10 +13,6 @@ #include <IceUtil/FileUtil.h> #include <IcePatch2/Util.h> -#ifdef __BCPLUSPLUS__ -# include <iterator> -#endif - using namespace std; using namespace Ice; using namespace IcePatch2; @@ -134,9 +130,6 @@ main(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp index 29cd1516563..1d428d4af19 100644 --- a/cpp/src/IcePatch2/Client.cpp +++ b/cpp/src/IcePatch2/Client.cpp @@ -170,11 +170,7 @@ private: keyPressed() { bool pressed = false; -#ifdef __BCPLUSPLUS__ - while(kbhit()) -#else while(_kbhit()) -#endif { pressed = true; _getch(); @@ -246,9 +242,6 @@ Client::run(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index 2db6d9ec383..0678927b886 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -75,9 +75,6 @@ IcePatch2::PatcherService::start(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index e9eb985191f..71a483796c4 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -63,9 +63,6 @@ Client::run(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp index db596d76f99..c251cf0ab39 100644 --- a/cpp/src/IceStorm/Subscriber.cpp +++ b/cpp/src/IceStorm/Subscriber.cpp @@ -14,10 +14,6 @@ #include <Ice/LoggerUtil.h> -#ifdef __BCPLUSPLUS__ -#include <iterator> -#endif - using namespace std; using namespace IceStorm; using namespace IceStormElection; @@ -581,9 +577,6 @@ Subscriber::create( Ice::ObjectPrx newObj; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif newObj = rec.obj->ice_timeout(instance->sendTimeout()); } catch(const Ice::FixedProxyException&) diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp index 78e0614cedc..209f994b87f 100644 --- a/cpp/src/iceserviceinstall/Install.cpp +++ b/cpp/src/iceserviceinstall/Install.cpp @@ -67,9 +67,6 @@ Install::run(int argc, char* argv[]) vector<string> commands; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif commands = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index dff98658826..f157cfbfbc9 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2364,13 +2364,13 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "try"; C << sb; - C.zeroIndent(); - C << nl << "#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) // C++Builder 2009 compiler bug"; - C.restoreIndent(); - C << nl << "IceUtil::DummyBCC dummy;"; - C.zeroIndent(); - C << nl << "#endif"; - C.restoreIndent(); + //C.zeroIndent(); + //C << nl << "#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) // C++Builder 2009 compiler bug"; + //C.restoreIndent(); + //C << nl << "IceUtil::DummyBCC dummy;"; + //C.zeroIndent(); + //C << nl << "#endif"; + //C.restoreIndent(); if(p->returnsData()) { diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 903b5f05f7d..c515de80370 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -107,9 +107,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index aa596978034..12f5cfe4bb9 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -101,9 +101,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 716fc40cbe5..685ca10c0cc 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1525,9 +1525,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index d2d5ff68273..16230ee76b4 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -17,10 +17,6 @@ #include <Slice/JavaUtil.h> #include <Slice/Util.h> -#ifdef __BCPLUSPLUS__ -# include <iterator> -#endif - using namespace std; using namespace Slice; using namespace IceUtil; @@ -1277,9 +1273,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index a779a0edd1c..df9d4db99d6 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -109,9 +109,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 06d41d2534f..7ff971cd459 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -16,10 +16,6 @@ #include <Slice/Util.h> #include <Gen.h> -#ifdef __BCPLUSPLUS__ -# include <iterator> -#endif - using namespace std; using namespace Slice; @@ -111,9 +107,6 @@ compile(int argc, char* argv[]) vector<string>args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index ea7af8b4102..57d5c945f5e 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1557,9 +1557,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp index 7b199aae800..9a7fac7a99f 100644 --- a/cpp/src/slice2py/Main.cpp +++ b/cpp/src/slice2py/Main.cpp @@ -426,9 +426,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp index f7d048ff7da..94acb028b07 100644 --- a/cpp/src/slice2rb/Main.cpp +++ b/cpp/src/slice2rb/Main.cpp @@ -110,9 +110,6 @@ compile(int argc, char* argv[]) vector<string> args; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif args = opts.parse(argc, (const char**)argv); } catch(const IceUtilInternal::BadOptException& e) diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp index 3ba601b0b5e..814b40e85ba 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -172,9 +172,6 @@ public: string id = ostr.str(); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif if(getState() == StateDeactivated) { _evictor->createServant(id, 0); @@ -315,9 +312,6 @@ public: // try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif servant = _evictor->createServant(id, 0); test(false); } diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp index 2aaf91e6ddd..74e64967290 100644 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ b/cpp/test/Freeze/evictor/TestI.cpp @@ -313,9 +313,6 @@ Test::ServantI::addFacet(const string& name, const string& data, const Current& try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif _evictor->addFacet(facet, current.id, name); } catch(const Ice::AlreadyRegisteredException&) @@ -329,9 +326,6 @@ Test::ServantI::removeFacet(const string& name, const Current& current) const { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif _evictor->removeFacet(current.id, name); } catch(const Ice::NotRegisteredException&) @@ -562,9 +556,6 @@ Test::RemoteEvictorI::createServant(const string& id, Int value, const Current&) ServantPtr servant = new ServantI(this, _evictor, value); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif return ServantPrx::uncheckedCast(_evictor->add(servant, ident)); } catch(const Ice::AlreadyRegisteredException&) diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp index 23210091976..df2c4216cb6 100644 --- a/cpp/test/Glacier2/sessionControl/Client.cpp +++ b/cpp/test/Glacier2/sessionControl/Client.cpp @@ -79,9 +79,6 @@ SessionControlClient::run(int argc, char* argv[]) cout << "testing create exceptions... " << flush; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif router->createSession("rejectme", "abc123"); test(false); } @@ -90,9 +87,6 @@ SessionControlClient::run(int argc, char* argv[]) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif router->createSession("localexception", "abc123"); test(false); } diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 17d19743457..9371dc689e5 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -35,9 +35,6 @@ allTests(const CommunicatorPtr& communicator) communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default"); test(false); } diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index dc9c8f0c3f0..76af8f611f4 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -480,9 +480,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif test->getAdapterName(); } catch(const Ice::ConnectionRefusedException&) @@ -530,9 +527,6 @@ allTests(const Ice::CommunicatorPtr& communicator) TestIntfPrx test3 = TestIntfPrx::uncheckedCast(test1); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif test(test3->ice_getConnection() == test1->ice_getConnection()); test(false); } @@ -645,9 +639,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif test->getAdapterName(); } catch(const Ice::ConnectionRefusedException&) @@ -707,9 +698,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif test->getAdapterName(); } catch(const Ice::ConnectionRefusedException&) @@ -751,9 +739,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(test->ice_getConnection() != testUDP->ice_getConnection()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif testUDP->getAdapterName(); } catch(const Ice::TwowayOnlyException&) diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index a65fa4b1a34..6384e231699 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -618,9 +618,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Ice::ObjectAdapterPtr first; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif first = communicator->createObjectAdapter("TestAdapter0"); test(false); } @@ -663,9 +660,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) adapter->add(obj, communicator->stringToIdentity("x")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adapter->add(obj, communicator->stringToIdentity("x")); test(false); } @@ -676,9 +670,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) adapter->remove(communicator->stringToIdentity("x")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adapter->remove(communicator->stringToIdentity("x")); test(false); } diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 79ea855329d..747889ea21b 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -50,9 +50,6 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); test(false); } @@ -62,9 +59,6 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); test(false); } @@ -88,9 +82,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(fm["f2"] == obj2); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adapter->removeAllFacets(communicator->stringToIdentity("id1")); test(false); } diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index a11b305badb..1ad22e4192f 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -119,9 +119,6 @@ TestI::migrateHello(const Ice::Current&) const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); } catch(Ice::NotRegisteredException&) diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 5f6072e8e42..e0cd07ff3f4 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -24,9 +24,6 @@ testUOE(const Ice::CommunicatorPtr& communicator) test(uoet); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif uoet->op(); test(false); } diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index ce2407d0cda..d1281280afe 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -40,9 +40,6 @@ allTests(const Ice::CommunicatorPtr& communicator) b1->ice_getFacet().empty()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("\"test -f facet'"); test(false); } @@ -60,9 +57,6 @@ allTests(const Ice::CommunicatorPtr& communicator) b1->ice_getFacet().empty()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("test test"); test(false); } @@ -73,9 +67,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b1->ice_getIdentity().name == "test test" && b1->ice_getIdentity().category.empty()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("test\\777"); test(false); } @@ -107,9 +98,6 @@ allTests(const Ice::CommunicatorPtr& communicator) b1->ice_getAdapterId() == "adapter"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("id@adapter test"); test(false); } @@ -149,9 +137,6 @@ allTests(const Ice::CommunicatorPtr& communicator) b1->ice_getFacet() == "facet x"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("id -f \"facet x"); test(false); } @@ -160,9 +145,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("id -f \'facet x"); test(false); } @@ -186,9 +168,6 @@ allTests(const Ice::CommunicatorPtr& communicator) b1->ice_getFacet() == "facet@test" && b1->ice_getAdapterId() == "test"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("test -f facet@test @test"); test(false); } @@ -214,9 +193,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("test:tcp@adapterId"); test(false); } @@ -235,9 +211,6 @@ allTests(const Ice::CommunicatorPtr& communicator) //} try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif b1 = communicator->stringToProxy("test::tcp"); test(false); } @@ -707,9 +680,6 @@ allTests(const Ice::CommunicatorPtr& communicator) // try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif p1->ice_ping(); test(false); } diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp index 45fb4d31a14..ba8b1b33eb6 100644 --- a/cpp/test/Ice/proxy/TestAMDI.cpp +++ b/cpp/test/Ice/proxy/TestAMDI.cpp @@ -38,9 +38,5 @@ bool MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const { _ctx = current.ctx; -#ifdef __BCPLUSPLUS__ return Test::MyDerivedClass::ice_isA(s, current); -#else - return MyDerivedClass::ice_isA(s, current); -#endif } diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index e6f974394de..038759a3a28 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -37,9 +37,5 @@ bool MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const { _ctx = current.ctx; -#ifdef __BCPLUSPLUS__ return Test::MyDerivedClass::ice_isA(s, current); -#else - return MyDerivedClass::ice_isA(s, current); -#endif } diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp index 778fcf96535..1ee4251d538 100644 --- a/cpp/test/Ice/servantLocator/AllTests.cpp +++ b/cpp/test/Ice/servantLocator/AllTests.cpp @@ -258,9 +258,6 @@ allTests(const CommunicatorPtr& communicator, bool collocated) obj = TestIntfPrx::checkedCast(base); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif TestIntfPrx::checkedCast(communicator->stringToProxy("category/unknown:default -p 12010")); } catch(const ObjectNotExistException&) @@ -275,9 +272,6 @@ allTests(const CommunicatorPtr& communicator, bool collocated) obj = TestIntfPrx::checkedCast(base); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif TestIntfPrx::checkedCast(communicator->stringToProxy("anothercategory/unknown:default -p 12010")); } catch(const ObjectNotExistException&) @@ -285,9 +279,6 @@ allTests(const CommunicatorPtr& communicator, bool collocated) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif TestIntfPrx::checkedCast(communicator->stringToProxy("unknown:default -p 12010")); } catch(const Ice::ObjectNotExistException&) diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index 5a41fe741e9..e453a22dae2 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -627,9 +627,6 @@ testUOO(const TestIntfPrx& test) Ice::ObjectPtr o; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif o = test->SUnknownAsObject(); test(false); } diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp index f74934f38e8..c7d449d93f6 100644 --- a/cpp/test/IceGrid/activation/AllTests.cpp +++ b/cpp/test/IceGrid/activation/AllTests.cpp @@ -195,9 +195,6 @@ allTests(const Ice::CommunicatorPtr& communicator) TestIntfPrx obj; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = TestIntfPrx::checkedCast(communicator->stringToProxy("server-manual")); test(false); } diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index 8450ec55df0..31acf11c45f 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -210,9 +210,6 @@ public: os << "stress-" << IceUtilInternal::random(6) + 1; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif return session->allocateObjectById(_communicator->stringToIdentity(os.str())); } catch(const AllocationTimeoutException&) @@ -232,9 +229,6 @@ public: { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif return session->allocateObjectByType("::StressTest"); } catch(const AllocationTimeoutException&) @@ -421,9 +415,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(communicator->stringToIdentity("dummy")); } catch(const ObjectNotRegisteredException&) @@ -431,9 +422,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->releaseObject(communicator->stringToIdentity("dummy")); } catch(const ObjectNotRegisteredException&) @@ -442,9 +430,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(communicator->stringToIdentity("nonallocatable")); test(false); } @@ -458,9 +443,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(communicator->stringToIdentity("nonallocatable")); test(false); } @@ -474,9 +456,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->releaseObject(communicator->stringToIdentity("nonallocatable")); test(false); } @@ -490,9 +469,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->releaseObject(communicator->stringToIdentity("nonallocatable")); test(false); } @@ -507,9 +483,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->allocateObjectById(allocatable); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatable); test(false); } @@ -522,9 +495,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable); test(false); } @@ -533,9 +503,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->releaseObject(allocatable); test(false); } @@ -546,9 +513,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->allocateObjectById(allocatablebis); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatablebis); test(false); } @@ -559,9 +523,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->allocateObjectById(allocatablebis); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatablebis); test(false); } @@ -582,9 +543,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->setAllocationTimeout(0); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatable); test(false); } @@ -593,9 +551,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->releaseObject(allocatable); test(false); } @@ -623,9 +578,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = session1->allocateObjectByType("::Unknown"); test(false); } @@ -639,9 +591,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = session1->allocateObjectByType("::NotAllocatable"); test(false); } @@ -657,9 +606,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(obj && obj->ice_getIdentity().name == "allocatable"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::Test"); test(false); } @@ -668,9 +614,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::Test"); test(false); } @@ -679,9 +622,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->releaseObject(obj->ice_getIdentity()); } catch(const AllocationException&) @@ -691,9 +631,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->releaseObject(obj->ice_getIdentity()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->releaseObject(obj->ice_getIdentity()); } catch(const AllocationException&) @@ -704,9 +641,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(obj && obj->ice_getIdentity().name == "allocatable"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::Test"); test(false); } @@ -715,9 +649,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::Test"); test(false); } @@ -727,9 +658,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->allocateObjectByType("::TestBis"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::TestBis"); test(false); } @@ -740,9 +668,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->allocateObjectByType("::TestBis"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::TestBis"); test(false); } @@ -771,9 +696,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->setAllocationTimeout(500); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable); test(false); } @@ -784,9 +706,6 @@ allTests(const Ice::CommunicatorPtr& communicator) time = IceUtil::Time::now(); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable); test(false); } @@ -797,9 +716,6 @@ allTests(const Ice::CommunicatorPtr& communicator) time = IceUtil::Time::now(); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::Test"); test(false); } @@ -824,9 +740,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->allocateObjectById(allocatable3); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable3); test(false); } @@ -835,9 +748,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable4); test(false); } @@ -849,9 +759,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session1->releaseObject(allocatable3); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectById(allocatable3); test(false); } @@ -862,9 +769,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->allocateObjectById(allocatable3); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatable3); test(false); } @@ -873,9 +777,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatable4); test(false); } @@ -886,9 +787,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2->releaseObject(allocatable3); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectById(allocatable3); test(false); } @@ -897,9 +795,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::TestServer1"); test(false); } @@ -908,9 +803,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::TestServer2"); test(false); } @@ -920,9 +812,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(session2->allocateObjectByType("::TestServer1")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::TestServer1"); test(false); } @@ -931,9 +820,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::TestServer2"); test(false); } @@ -974,9 +860,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(session1->allocateObjectByType("::TestMultipleByServer")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::TestMultipleByServer"); test(false); } @@ -989,9 +872,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(session2->allocateObjectByType("::TestMultipleByServer")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::TestMultipleByServer"); test(false); } @@ -1008,9 +888,6 @@ allTests(const Ice::CommunicatorPtr& communicator) test(obj2); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session1->allocateObjectByType("::TestMultipleServer"); test(false); } @@ -1019,9 +896,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session2->allocateObjectByType("::TestMultipleServer"); test(false); } diff --git a/cpp/test/IceGrid/deployer/AllTests.cpp b/cpp/test/IceGrid/deployer/AllTests.cpp index acce2f3f4ed..8afe27e2aee 100644 --- a/cpp/test/IceGrid/deployer/AllTests.cpp +++ b/cpp/test/IceGrid/deployer/AllTests.cpp @@ -137,9 +137,6 @@ logTests(const Ice::CommunicatorPtr& comm, const AdminSessionPrx& session) assert(!testDir.empty()); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session->openServerStdErr("LogServer", -1); test(false); } @@ -148,9 +145,6 @@ logTests(const Ice::CommunicatorPtr& comm, const AdminSessionPrx& session) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session->openServerStdOut("LogServer", -1); test(false); } @@ -159,9 +153,6 @@ logTests(const Ice::CommunicatorPtr& comm, const AdminSessionPrx& session) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif session->openServerLog("LogServer", "unknown.txt", -1); test(false); } diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp index e91f9712561..43b04940f4c 100644 --- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp +++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp @@ -235,9 +235,6 @@ allTests(const Ice::CommunicatorPtr& comm) obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false)); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter"); test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter"); test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter"); @@ -248,9 +245,6 @@ allTests(const Ice::CommunicatorPtr& comm) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj->getReplicaId(); test(false); } @@ -418,9 +412,6 @@ allTests(const Ice::CommunicatorPtr& comm) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj->getReplicaId(); test(false); } diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index a33ba260869..5c52a2f9efb 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -427,9 +427,6 @@ allTests(const Ice::CommunicatorPtr& comm) { try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif masterRegistry->createSessionFromSecureConnection(); } catch(const PermissionDeniedException&) @@ -439,9 +436,6 @@ allTests(const Ice::CommunicatorPtr& comm) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Registry->createSession("dummy", ""); } catch(const PermissionDeniedException&) @@ -449,9 +443,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Registry->createSessionFromSecureConnection(); } catch(const PermissionDeniedException&) @@ -472,9 +463,6 @@ allTests(const Ice::CommunicatorPtr& comm) test(slave1Mapper->getUserAccount("Dummy User Account2") == "dummy2"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif masterMapper->getUserAccount("unknown"); test(false); } @@ -483,9 +471,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Mapper->getUserAccount("unknown"); test(false); } @@ -501,9 +486,6 @@ allTests(const Ice::CommunicatorPtr& comm) comm->stringToProxy("TestIceGrid/SSLSessionManager")->ice_locator(replicatedLocator)->ice_ping(); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif comm->stringToProxy("TestIceGrid/SessionManager-Slave1")->ice_locator(replicatedLocator)->ice_ping(); test(false); } @@ -512,9 +494,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif comm->stringToProxy("TestIceGrid/SSLSessionManager-Slave1")->ice_locator(replicatedLocator)->ice_ping(); test(false); } @@ -565,9 +544,6 @@ allTests(const Ice::CommunicatorPtr& comm) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Admin->addApplication(app); test(false); } @@ -721,9 +697,6 @@ allTests(const Ice::CommunicatorPtr& comm) slave2Admin = createAdminSession(slave2Locator, "Slave2"); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif masterAdmin->getApplicationInfo("TestApp"); test(false); } @@ -732,9 +705,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Admin->getApplicationInfo("TestApp"); test(false); } @@ -743,9 +713,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave2Admin->getApplicationInfo("TestApp"); test(false); } @@ -754,9 +721,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif masterAdmin->getAdapterInfo("TestAdpt"); test(false); } @@ -765,9 +729,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Admin->getAdapterInfo("TestAdpt"); test(false); } @@ -776,9 +737,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave2Admin->getAdapterInfo("TestAdpt"); test(false); } @@ -787,9 +745,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif masterAdmin->getObjectInfo(obj.proxy->ice_getIdentity()); test(false); } @@ -798,9 +753,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave1Admin->getObjectInfo(obj.proxy->ice_getIdentity()); test(false); } @@ -809,9 +761,6 @@ allTests(const Ice::CommunicatorPtr& comm) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif slave2Admin->getObjectInfo(obj.proxy->ice_getIdentity()); test(false); } diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index b3f7018f311..701cf408f94 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -629,9 +629,6 @@ allTests(const Ice::CommunicatorPtr& communicator) session2 = SessionPrx::uncheckedCast(registry2->createSession("client2", "test2")->ice_connectionId("reg2")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif registry1->createSession("client3", "test1"); test(false); } @@ -688,9 +685,6 @@ allTests(const Ice::CommunicatorPtr& communicator) registry2->createAdminSession("admin2", "test2")->ice_connectionId("reg2")); try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif registry1->createAdminSession("admin3", "test1"); test(false); } @@ -813,9 +807,6 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing sessions from secure connection... " << flush; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif registry1->createSessionFromSecureConnection(); test(false); } @@ -824,9 +815,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif registry1->createAdminSessionFromSecureConnection(); test(false); } @@ -853,9 +841,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif router1->createSession("client3", "test1"); test(false); } @@ -932,9 +917,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif adminRouter1->createSession("client3", "test1"); test(false); } diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp index 797d7ff96f7..30c35817cfe 100644 --- a/cpp/test/IceGrid/simple/AllTests.cpp +++ b/cpp/test/IceGrid/simple/AllTests.cpp @@ -162,9 +162,6 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) cout << "testing whether server is still reachable... " << flush; try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj = TestIntfPrx::checkedCast(base); test(false); } @@ -173,9 +170,6 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) } try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif obj2 = TestIntfPrx::checkedCast(base2); test(false); } diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index 6f30e825d51..1fc6ad11b3f 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -294,9 +294,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif admin->getServerInfo("Server2"); test(false); } @@ -350,9 +347,6 @@ allTests(const Ice::CommunicatorPtr& communicator) try { -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - IceUtil::DummyBCC dummy; -#endif admin->getServerInfo("Server1"); test(false); } |