diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-12-10 09:04:51 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-12-10 09:04:51 -0800 |
| commit | 32490d84ceebae499bbe2048e08bbbe8c38ca6af (patch) | |
| tree | 1ab7ec68f5411e0f039df420b888f49c2cc1103d /cpp | |
| parent | ICE-5116 - Bumped watch dog timeout to 4 minutes (diff) | |
| download | ice-32490d84ceebae499bbe2048e08bbbe8c38ca6af.tar.bz2 ice-32490d84ceebae499bbe2048e08bbbe8c38ca6af.tar.xz ice-32490d84ceebae499bbe2048e08bbbe8c38ca6af.zip | |
ICE-5124 - compile failure in optional test
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/optional/AllTests.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index ecaa1d44d26..4332be765cf 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -1021,8 +1021,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) IceUtil::Optional<FixedStructSeq> p2 = initial->opFixedStructSeq(p1, p3); test(!p2 && !p3); - p1 = std::pair<const FixedStruct*, const FixedStruct*>(0, 0); - p2 = initial->opFixedStructSeq(p1, p3); + std::pair<const FixedStruct*, const FixedStruct*> p; + p.first = p.second = 0; + p2 = initial->opFixedStructSeq(p, p3); test(p2 && p3 && p2.get().empty() && p3.get().empty()); FixedStruct fss[10]; |