diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
| commit | 883edab4361e58957796f25d5fc55cfb41f0f6ea (patch) | |
| tree | fc90adc372b66bf0becf4c0912794c64af250a29 /cpp/test/Ice/metrics/Collocated.cpp | |
| parent | ICE-7242 - Cross test updates (diff) | |
| download | ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.bz2 ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.xz ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.zip | |
Deprecate Communicator::stringToIdentity and identityToString
Diffstat (limited to 'cpp/test/Ice/metrics/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/metrics/Collocated.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp index 3bfed32f91a..dd314954612 100644 --- a/cpp/test/Ice/metrics/Collocated.cpp +++ b/cpp/test/Ice/metrics/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(MetricsI), communicator->stringToIdentity("metrics")); + adapter->add(ICE_MAKE_SHARED(MetricsI), Ice::stringToIdentity("metrics")); //adapter->activate(); // Don't activate OA to ensure collocation is used. communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); - controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), communicator->stringToIdentity("controller")); + controllerAdapter->add(ICE_MAKE_SHARED(ControllerI, adapter), Ice::stringToIdentity("controller")); //controllerAdapter->activate(); // Don't activate OA to ensure collocation is used. MetricsPrxPtr allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&); |