summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/FreezeScript/DumpDB.cpp3
-rw-r--r--cpp/src/FreezeScript/Parser.cpp4
-rw-r--r--cpp/src/FreezeScript/transformdb.cpp3
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp30
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp3
-rw-r--r--cpp/src/Ice/Makefile.mak4
-rw-r--r--cpp/src/Ice/Network.cpp8
-rw-r--r--cpp/src/Ice/Protocol.cpp8
-rw-r--r--cpp/src/Ice/Proxy.cpp24
-rw-r--r--cpp/src/Ice/RouterInfo.cpp3
-rw-r--r--cpp/src/Ice/Service.cpp3
-rw-r--r--cpp/src/IceBox/Admin.cpp3
-rw-r--r--cpp/src/IceBox/Exception.cpp4
-rw-r--r--cpp/src/IceBox/Service.cpp3
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp3
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp3
-rw-r--r--cpp/src/IceGrid/Client.cpp3
-rw-r--r--cpp/src/IceGrid/IceGridNode.cpp7
-rw-r--r--cpp/src/IceGrid/IceGridRegistry.cpp9
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp6
-rw-r--r--cpp/src/IceGrid/NodeI.cpp3
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp12
-rw-r--r--cpp/src/IceGrid/SessionServantManager.cpp4
-rw-r--r--cpp/src/IcePatch2/Calc.cpp7
-rw-r--r--cpp/src/IcePatch2/Client.cpp7
-rw-r--r--cpp/src/IcePatch2/Server.cpp3
-rw-r--r--cpp/src/IceStorm/Admin.cpp3
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp7
-rw-r--r--cpp/src/iceserviceinstall/Install.cpp3
-rw-r--r--cpp/src/slice2cpp/Gen.cpp14
-rw-r--r--cpp/src/slice2cpp/Main.cpp3
-rw-r--r--cpp/src/slice2cs/Main.cpp3
-rw-r--r--cpp/src/slice2freeze/Main.cpp3
-rw-r--r--cpp/src/slice2freezej/Main.cpp7
-rw-r--r--cpp/src/slice2html/Main.cpp3
-rw-r--r--cpp/src/slice2java/Main.cpp7
-rw-r--r--cpp/src/slice2php/Main.cpp3
-rw-r--r--cpp/src/slice2py/Main.cpp3
-rw-r--r--cpp/src/slice2rb/Main.cpp3
39 files changed, 9 insertions, 223 deletions
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)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 19:50:27 +0000