diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-01-29 12:25:48 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-01-29 12:25:48 -0800 |
| commit | 04a0f44df84c008f3579b59f6a160ed3436016ea (patch) | |
| tree | 7ba55593af69dacdfaf00170b11965153fb44f77 /cpp | |
| parent | Fix (ICE-6286) - IncomingConnectionFactory::createAcceptor does not handle Th... (diff) | |
| download | ice-04a0f44df84c008f3579b59f6a160ed3436016ea.tar.bz2 ice-04a0f44df84c008f3579b59f6a160ed3436016ea.tar.xz ice-04a0f44df84c008f3579b59f6a160ed3436016ea.zip | |
more IPv6 fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/adapterDeactivation/AllTests.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/facets/AllTests.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/location/AllTests.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 3280a561983..8186540cb30 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -31,7 +31,7 @@ allTests(const CommunicatorPtr& communicator) { string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? - "127.0.0.1" : "0:0:0:0:0:0:0:1"; + "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; cout << "creating/destroying/recreating object adapter... " << flush; ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -h " + host); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index f955dd2198e..6efc38e212b 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -45,7 +45,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing facet registration exceptions... " << flush; string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? - "127.0.0.1" : "0:0:0:0:0:0:0:1"; + "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", "default -h " + host); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); Ice::ObjectPtr obj = new EmptyI; diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index b10dcd45238..4518ae1d20c 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -623,7 +623,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) cout << "ok" << endl; string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? - "127.0.0.1" : "0:0:0:0:0:0:0:1"; + "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; if(communicator->getProperties()->getProperty("Ice.Default.Host") == host) { cout << "testing indirect proxies to collocated objects... " << flush; |