summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/Client.cpp88
-rw-r--r--cpp/src/IceSSL/EndpointI.cpp12
-rw-r--r--cpp/src/slice2cs/Gen.cpp26
-rw-r--r--cpp/src/slice2java/Gen.cpp33
4 files changed, 64 insertions, 95 deletions
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 1b38c97dfbe..052957900ac 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -34,7 +34,7 @@
#endif
using namespace std;
-//using namespace Ice; // COMPILERFIX: VC6 reports compilation error because of ambiguous Locator symbol.
+using namespace Ice;
using namespace IceGrid;
class Client;
@@ -92,7 +92,7 @@ public:
{
_session->keepAlive();
}
- catch(const Ice::Exception&)
+ catch(const Exception&)
{
break;
}
@@ -115,40 +115,40 @@ private:
};
typedef IceUtil::Handle<SessionKeepAliveThread> SessionKeepAliveThreadPtr;
-class ReuseConnectionRouter : public Ice::Router
+class ReuseConnectionRouter : public Router
{
public:
- ReuseConnectionRouter(const Ice::ObjectPrx& proxy) : _clientProxy(proxy)
+ ReuseConnectionRouter(const ObjectPrx& proxy) : _clientProxy(proxy)
{
}
- virtual Ice::ObjectPrx
- getClientProxy(const Ice::Current&) const
+ virtual ObjectPrx
+ getClientProxy(const Current&) const
{
return _clientProxy;
}
- virtual Ice::ObjectPrx
- getServerProxy(const Ice::Current&) const
+ virtual ObjectPrx
+ getServerProxy(const Current&) const
{
return 0;
}
virtual void
- addProxy(const Ice::ObjectPrx&, const Ice::Current&)
+ addProxy(const ObjectPrx&, const Current&)
{
}
- virtual Ice::ObjectProxySeq
- addProxies(const Ice::ObjectProxySeq&, const Ice::Current&)
+ virtual ObjectProxySeq
+ addProxies(const ObjectProxySeq&, const Current&)
{
- return Ice::ObjectProxySeq();
+ return ObjectProxySeq();
}
private:
- const Ice::ObjectPrx _clientProxy;
+ const ObjectPrx _clientProxy;
};
class Client : public IceUtil::Monitor<IceUtil::Mutex>
@@ -156,11 +156,11 @@ class Client : public IceUtil::Monitor<IceUtil::Mutex>
public:
void usage();
- int main(Ice::StringSeq& args);
- int run(Ice::StringSeq& args);
+ int main(StringSeq& args);
+ int run(StringSeq& args);
void interrupted();
- Ice::CommunicatorPtr communicator() const { return _communicator; }
+ CommunicatorPtr communicator() const { return _communicator; }
const string& appName() const { return _appName; }
string getPassword(const string&);
@@ -168,7 +168,7 @@ public:
private:
IceUtil::CtrlCHandler _ctrlCHandler;
- Ice::CommunicatorPtr _communicator;
+ CommunicatorPtr _communicator;
string _appName;
ParserPtr _parser;
};
@@ -196,7 +196,7 @@ main(int argc, char* argv[])
#endif
{
Client app;
- Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+ StringSeq args = argsToStringSeq(argc, argv);
return app.main(args);
}
@@ -220,22 +220,22 @@ Client::usage()
int
-Client::main(Ice::StringSeq& args)
+Client::main(StringSeq& args)
{
int status = EXIT_SUCCESS;
try
{
_appName = args[0];
- Ice::InitializationData id;
- id.properties = Ice::createProperties(args);
+ InitializationData id;
+ id.properties = createProperties(args);
//
// We don't want to load DB plug-ins with icegridadmin, as this will
// cause FileLock issues when run with the same configuration file
// used by the service.
//
id.properties->setProperty("Ice.Plugin.DB", "");
- _communicator = Ice::initialize(id);
+ _communicator = initialize(id);
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_staticMutex);
@@ -247,7 +247,7 @@ Client::main(Ice::StringSeq& args)
{
status = run(args);
}
- catch(const Ice::CommunicatorDestroyedException&)
+ catch(const CommunicatorDestroyedException&)
{
// Expected if the client is interrupted during the initialization.
}
@@ -284,10 +284,10 @@ Client::main(Ice::StringSeq& args)
{
_communicator->destroy();
}
- catch(const Ice::CommunicatorDestroyedException&)
+ catch(const CommunicatorDestroyedException&)
{
}
- catch(const Ice::Exception& ex)
+ catch(const Exception& ex)
{
cerr << ex << endl;
status = EXIT_FAILURE;
@@ -322,14 +322,14 @@ Client::interrupted()
{
_communicator->destroy();
}
- catch(const Ice::Exception&)
+ catch(const Exception&)
{
}
}
}
int
-Client::run(Ice::StringSeq& originalArgs)
+Client::run(StringSeq& originalArgs)
{
string commands;
bool debug;
@@ -376,10 +376,10 @@ Client::run(Ice::StringSeq& originalArgs)
if(opts.isSet("server"))
{
- Ice::ObjectAdapterPtr adapter =
+ ObjectAdapterPtr adapter =
communicator()->createObjectAdapterWithEndpoints("FileParser", "tcp -h localhost");
adapter->activate();
- Ice::ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser"));
+ ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser"));
cout << proxy << endl;
communicator()->waitForShutdown();
@@ -413,7 +413,7 @@ Client::run(Ice::StringSeq& originalArgs)
password = opts.optArg("password");
}
- Ice::PropertiesPtr properties = communicator()->getProperties();
+ PropertiesPtr properties = communicator()->getProperties();
string replica = properties->getProperty("IceGridAdmin.Replica");
if(!opts.optArg("replica").empty())
{
@@ -439,7 +439,7 @@ Client::run(Ice::StringSeq& originalArgs)
return EXIT_FAILURE;
}
}
- catch(const Ice::LocalException& ex)
+ catch(const LocalException& ex)
{
cerr << _appName << ": could not contact the default router:" << endl << ex << endl;
return EXIT_FAILURE;
@@ -501,7 +501,7 @@ Client::run(Ice::StringSeq& originalArgs)
//
// Create the identity of the registry to connect to.
//
- Ice::Identity registryId;
+ Identity registryId;
registryId.category = communicator()->getDefaultLocator()->ice_getIdentity().category;
registryId.name = "Registry";
if(!replica.empty() && replica != "Master")
@@ -526,7 +526,7 @@ Client::run(Ice::StringSeq& originalArgs)
}
localRegistry = locator->getLocalRegistry();
}
- catch(const Ice::LocalException& ex)
+ catch(const LocalException& ex)
{
cerr << _appName << ": could not contact the default locator:" << endl << ex << endl;
return EXIT_FAILURE;
@@ -552,12 +552,12 @@ Client::run(Ice::StringSeq& originalArgs)
cerr << _appName << ": could not contact an IceGrid registry" << endl;
}
}
- catch(const Ice::NotRegisteredException&)
+ catch(const NotRegisteredException&)
{
cerr << _appName << ": no active registry replica named `" << replica << "'" << endl;
return EXIT_FAILURE;
}
- catch(const Ice::LocalException& ex)
+ catch(const LocalException& ex)
{
if(!replica.empty())
{
@@ -591,10 +591,10 @@ Client::run(Ice::StringSeq& originalArgs)
if(registry->ice_getIdentity() == localRegistry->ice_getIdentity())
{
properties->setProperty("CollocInternal.AdapterId", IceUtil::generateUUID());
- Ice::ObjectAdapterPtr colloc = communicator()->createObjectAdapter("CollocInternal");
+ ObjectAdapterPtr colloc = communicator()->createObjectAdapter("CollocInternal");
colloc->setLocator(0);
- Ice::ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator));
- communicator()->setDefaultRouter(Ice::RouterPrx::uncheckedCast(router));
+ ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator));
+ communicator()->setDefaultRouter(RouterPrx::uncheckedCast(router));
registry = registry->ice_router(communicator()->getDefaultRouter());
}
@@ -654,8 +654,8 @@ Client::run(Ice::StringSeq& originalArgs)
AdminPrx admin = session->getAdmin();
- Ice::SliceChecksumDict serverChecksums = admin->getSliceChecksums();
- Ice::SliceChecksumDict localChecksums = Ice::sliceChecksums();
+ SliceChecksumDict serverChecksums = admin->getSliceChecksums();
+ SliceChecksumDict localChecksums = sliceChecksums();
//
// The following slice types are only used by the admin CLI.
@@ -663,9 +663,9 @@ Client::run(Ice::StringSeq& originalArgs)
localChecksums.erase("::IceGrid::FileParser");
localChecksums.erase("::IceGrid::ParseException");
- for(Ice::SliceChecksumDict::const_iterator q = localChecksums.begin(); q != localChecksums.end(); ++q)
+ for(SliceChecksumDict::const_iterator q = localChecksums.begin(); q != localChecksums.end(); ++q)
{
- Ice::SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
+ SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
if(r == serverChecksums.end())
{
cerr << appName() << ": server is using unknown Slice type `" << q->first << "'" << endl;
@@ -734,7 +734,7 @@ Client::run(Ice::StringSeq& originalArgs)
session->destroy();
}
}
- catch(const Ice::Exception&)
+ catch(const Exception&)
{
}
throw;
@@ -759,7 +759,7 @@ Client::run(Ice::StringSeq& originalArgs)
session->destroy();
}
}
- catch(const Ice::Exception&)
+ catch(const Exception&)
{
// Ignore. If the registry has been shutdown this will cause
// an exception.
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 4d389371d42..a9eb8e707d8 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -271,11 +271,8 @@ IceSSL::EndpointI::toString() const
return s.str();
}
-//
-// COMPILERFIX: VC6 complains about an ambiguous "EndpointInfo" symbol when this class is defined inside
-// getInfo(). Moving the definition into an anonymous namespace works around it.
-//
-namespace
+Ice::EndpointInfoPtr
+IceSSL::EndpointI::getInfo() const
{
class InfoI : public IceSSL::EndpointInfo
{
@@ -304,11 +301,6 @@ namespace
return true;
}
};
-}
-
-Ice::EndpointInfoPtr
-IceSSL::EndpointI::getInfo() const
-{
return new InfoI(_protocol, _encoding, _timeout, _compress, _host, _port);
}
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 0053fd2a01f..f636b758a77 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -28,20 +28,8 @@
using namespace std;
using namespace Slice;
-
-//
-// Don't use "using namespace IceUtil", or VC++ 6.0 complains about
-// ambigious symbols for constructs like
-// "IceUtil::constMemFun(&Slice::Exception::isLocal)".
-//
-using IceUtilInternal::Output;
-using IceUtilInternal::nl;
-using IceUtilInternal::sp;
-using IceUtilInternal::sb;
-using IceUtilInternal::eb;
-using IceUtilInternal::spar;
-using IceUtilInternal::epar;
-using IceUtilInternal::trim;
+using namespace IceUtil;
+using namespace IceUtilInternal;
static string // Should be an anonymous namespace, but VC++ 6 can't handle that.
sliceModeToIceMode(Operation::Mode opMode)
@@ -189,9 +177,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
// when inlining is on. The code below issues a warning: better
// than an error!
//
- transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun<string,ClassDef>(&Contained::scoped));
+ transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun<string,ClassDef>(&Contained::scoped));
#else
- transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+ transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
#endif
StringList other;
@@ -615,9 +603,9 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream)
//
// See comment for transform above
//
- transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun<string,Operation>(&Contained::name));
+ transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun<string,Operation>(&Contained::name));
#else
- transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+ transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name));
#endif
allOpNames.push_back("ice_id");
allOpNames.push_back("ice_ids");
@@ -2026,7 +2014,7 @@ Slice::Gen::generateChecksums(const UnitPtr& u)
ChecksumMap map = createChecksums(u);
if(!map.empty())
{
- string className = "X" + IceUtil::generateUUID();
+ string className = "X" + generateUUID();
for(string::size_type pos = 1; pos < className.size(); ++pos)
{
if(!isalnum(static_cast<unsigned char>(className[pos])))
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 472acac73f7..3f0c23c2aca 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -21,19 +21,8 @@
using namespace std;
using namespace Slice;
-
-//
-// Don't use "using namespace IceUtil", or VC++ 6.0 complains
-// about ambiguous symbols for constructs like
-// "IceUtil::constMemFun(&Slice::Exception::isLocal)".
-//
-using IceUtilInternal::Output;
-using IceUtilInternal::nl;
-using IceUtilInternal::sp;
-using IceUtilInternal::sb;
-using IceUtilInternal::eb;
-using IceUtilInternal::spar;
-using IceUtilInternal::epar;
+using namespace IceUtil;
+using namespace IceUtilInternal;
static string
sliceModeToIceMode(Operation::Mode opMode)
@@ -830,7 +819,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
ClassList allBases = p->allBases();
StringList ids;
- transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+ transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
StringList other;
other.push_back(scoped);
other.push_back("::Ice::Object");
@@ -840,7 +829,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
StringList::const_iterator firstIter = ids.begin();
StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
assert(scopedIter != ids.end());
- StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+ StringList::difference_type scopedPos = ::IceUtilInternal::distance(firstIter, scopedIter);
out << sp << nl << "public static final String[] __ids =";
out << sb;
@@ -1298,7 +1287,7 @@ Slice::JavaVisitor::writeDispatchAndMarshalling(Output& out, const ClassDefPtr&
if(!allOps.empty())
{
StringList allOpNames;
- transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), ::IceUtil::constMemFun(&Contained::name));
+ transform(allOps.begin(), allOps.end(), back_inserter(allOpNames), constMemFun(&Contained::name));
allOpNames.push_back("ice_id");
allOpNames.push_back("ice_ids");
allOpNames.push_back("ice_isA");
@@ -3102,11 +3091,11 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
}
else
{
- IceUtil::Int64 v = 0;
+ Int64 v = 0;
serialVersionUID = serialVersionUID.substr(pos);
if(serialVersionUID != "0")
{
- if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error
+ if(!stringToInt64(serialVersionUID, v)) // conversion error
{
ostringstream os;
os << "ignoring invalid serialVersionUID for class `" << p->scoped()
@@ -3874,11 +3863,11 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
}
else
{
- IceUtil::Int64 v = 0;
+ Int64 v = 0;
serialVersionUID = serialVersionUID.substr(pos);
if(serialVersionUID != "0")
{
- if(!IceUtilInternal::stringToInt64(serialVersionUID, v)) // conversion error
+ if(!stringToInt64(serialVersionUID, v)) // conversion error
{
ostringstream os;
os << "ignoring invalid serialVersionUID for struct `" << p->scoped()
@@ -4943,7 +4932,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
ClassList allBases = p->allBases();
StringList ids;
- transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+ transform(allBases.begin(), allBases.end(), back_inserter(ids), constMemFun(&Contained::scoped));
StringList other;
other.push_back(scoped);
other.push_back("::Ice::Object");
@@ -4953,7 +4942,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
StringList::const_iterator firstIter = ids.begin();
StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), scoped);
assert(scopedIter != ids.end());
- StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+ StringList::difference_type scopedPos = ::IceUtilInternal::distance(firstIter, scopedIter);
out << sp << nl << "public static final String[] __ids =";
out << sb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 03:08:28 +0000