diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-09-27 10:16:31 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-09-27 10:16:31 -0700 |
| commit | ced0ab85cf66c785352333ecf72214fb069793dd (patch) | |
| tree | 16866cdab7f97dec35d0c216d83cfeb901d91ed0 /cpp/test/Ice/optional/TestI.cpp | |
| parent | ICE-4859 - test/Ice/hash slice should be generated in test.Ice.hash package (diff) | |
| download | ice-ced0ab85cf66c785352333ecf72214fb069793dd.tar.bz2 ice-ced0ab85cf66c785352333ecf72214fb069793dd.tar.xz ice-ced0ab85cf66c785352333ecf72214fb069793dd.zip | |
clean up optional tests; bug fixes for Java/C#
Diffstat (limited to 'cpp/test/Ice/optional/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/optional/TestI.cpp | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 826d0e9178c..b40ee6cf67d 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -318,23 +318,24 @@ InitialI::opVarStructSeq(const Optional<pair<VarStructSeq::const_iterator, VarSt return p3; } +Optional<Serializable> +InitialI::opSerializable(const Optional<Serializable>& p1, Optional<Serializable>& p3, const Current&) +{ + p3 = p1; + return p3; +} + Optional<IntIntDict> InitialI::opIntIntDict(const Optional<IntIntDict>& p1, Optional<IntIntDict>& p3, const Current&) { - if(p1) - { - p3 = p1; - } + p3 = p1; return p3; } Optional<StringIntDict> InitialI::opStringIntDict(const Optional<StringIntDict>& p1, Optional<StringIntDict>& p3, const Current&) { - if(p1) - { - p3 = p1; - } + p3 = p1; return p3; } @@ -342,3 +343,21 @@ void InitialI::opClassAndUnknownOptional(const APtr& a, const Ice::Current&) { } + +bool +InitialI::supportsRequiredParams(const Ice::Current&) +{ + return false; +} + +bool +InitialI::supportsJavaSerializable(const Ice::Current&) +{ + return true; +} + +bool +InitialI::supportsCsharpSerializable(const Ice::Current&) +{ + return true; +} |