diff options
Diffstat (limited to 'cpp/src/IceGrid/Client.cpp')
-rw-r--r-- | cpp/src/IceGrid/Client.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 73842bb9da2..c0c58603453 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -12,7 +12,7 @@ #include <IceUtil/CtrlCHandler.h> #include <IceUtil/Thread.h> #include <IceUtil/StringUtil.h> -#include <IceUtil/UUID.h> +#include <Ice/UUID.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <Ice/Ice.h> @@ -20,7 +20,6 @@ #include <IceGrid/Parser.h> #include <IceGrid/FileParserI.h> #include <IceGrid/Registry.h> -#include <IceGrid/Locator.h> #include <IceGrid/IceLocatorDiscovery.h> #include <Glacier2/Router.h> #include <fstream> @@ -450,7 +449,7 @@ Client::run(StringSeq& originalArgs) ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints("FileParser", "tcp -h localhost"); adapter->activate(); - ObjectPrx proxy = adapter->add(new FileParserI, communicator()->stringToIdentity("FileParser")); + ObjectPrx proxy = adapter->add(new FileParserI, stringToIdentity("FileParser")); cout << proxy << endl; communicator()->waitForShutdown(); |