diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-02 21:35:46 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-02 21:35:46 -0400 |
| commit | 7edb88a3ca51ead85a8d26b86c9bfd111a88e36b (patch) | |
| tree | 11407a5b2de33133e346075d7d441598ca95673b /cpp/test | |
| parent | VC90 build failure IceProxy::Ice::noExplicitContext unresolved symbol (diff) | |
| download | ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.tar.bz2 ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.tar.xz ice-7edb88a3ca51ead85a8d26b86c9bfd111a88e36b.zip | |
Small fixes to synchronize with the Ice manual
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/admin/AllTests.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 97a6c110045..274edaacaf0 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -190,9 +190,17 @@ allTests(const Ice::CommunicatorPtr& communicator) init.properties = Ice::createProperties(); init.properties->setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties->setProperty("Ice.Admin.InstanceName", "Test"); - Ice::CommunicatorPtr com = Ice::initialize(init); - testFacets(com); - com->destroy(); + Ice::CommunicatorHolder ich(init); + testFacets(ich.communicator()); + +#ifdef ICE_CPP11_MAPPING + // Test move assignment on CommunicatorHolder + std::shared_ptr<Ice::Communicator> nullCommunicator; + Ice::CommunicatorHolder ich2(nullCommunicator); + ich2 = std::move(ich); + test(ich2.communicator()); + test(!ich.communicator()); +#endif } { // |