summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/optional/AllTests.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp
index 2d37120a6de..06bb5284e57 100644
--- a/cpp/test/Ice/optional/AllTests.cpp
+++ b/cpp/test/Ice/optional/AllTests.cpp
@@ -1429,6 +1429,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool)
IceUtil::Optional<OneOptionalPtr> p2 = initial->opOneOptional(p1, p3);
test(!p2 && !p3);
+ if(initial->supportsNullOptional())
+ {
+ p2 = initial->opOneOptional(OneOptionalPtr(), p3);
+ test(*p2 == ICE_NULLPTR && *p3 == ICE_NULLPTR);
+ }
+
p1 = ICE_MAKE_SHARED(OneOptional, 58);
p2 = initial->opOneOptional(p1, p3);
test((*p2)->a == 58 && (*p3)->a == 58);