diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-01 16:37:29 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-01 16:37:29 +0200 |
| commit | db53db6c3e2e75d17e65e6649d85436b1e889944 (patch) | |
| tree | 0df84b4b8d77eb8d35115efb9a44cec46ea80fbb /cpp/test/Ice/operations/TestI.cpp | |
| parent | Fixed servant locator cookie bug introduced with dispatch code changes (diff) | |
| download | ice-db53db6c3e2e75d17e65e6649d85436b1e889944.tar.bz2 ice-db53db6c3e2e75d17e65e6649d85436b1e889944.tar.xz ice-db53db6c3e2e75d17e65e6649d85436b1e889944.zip | |
Added support for C+11 marshaled results
Diffstat (limited to 'cpp/test/Ice/operations/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/TestI.cpp | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 7b7f4ba6c33..91154cf5769 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -843,6 +843,48 @@ MyDerivedClassI::opWStringLiterals(const Ice::Current&) return data; } +#ifdef ICE_CPP11_MAPPING +MyDerivedClassI::OpMStruct1MarshaledResult +MyDerivedClassI::opMStruct1(const Ice::Current& current) +{ + Test::Structure s; + s.e = ICE_ENUM(MyEnum, enum1); // enum must be initialized + return OpMStruct1MarshaledResult(s, current); +} + + +MyDerivedClassI::OpMStruct2MarshaledResult +MyDerivedClassI::opMStruct2(ICE_IN(Test::Structure) p1, const Ice::Current& current) +{ + return OpMStruct2MarshaledResult(p1, p1, current); +} + +MyDerivedClassI::OpMSeq1MarshaledResult +MyDerivedClassI::opMSeq1(const Ice::Current& current) +{ + return OpMSeq1MarshaledResult(Test::StringS(), current); +} + +MyDerivedClassI::OpMSeq2MarshaledResult +MyDerivedClassI::opMSeq2(ICE_IN(Test::StringS) p1, const Ice::Current& current) +{ + return OpMSeq2MarshaledResult(p1, p1, current); +} + +MyDerivedClassI::OpMDict1MarshaledResult +MyDerivedClassI::opMDict1(const Ice::Current& current) +{ + return OpMDict1MarshaledResult(Test::StringStringD(), current); +} + +MyDerivedClassI::OpMDict2MarshaledResult +MyDerivedClassI::opMDict2(ICE_IN(Test::StringStringD) p1, const Ice::Current& current) +{ + return OpMDict2MarshaledResult(p1, p1, current); +} + +#else + Test::Structure MyDerivedClassI::opMStruct1(const Ice::Current&) { @@ -851,7 +893,6 @@ MyDerivedClassI::opMStruct1(const Ice::Current&) return s; } - Test::Structure MyDerivedClassI::opMStruct2(ICE_IN(Test::Structure) p1, Test::Structure& p2, const Ice::Current&) { @@ -885,3 +926,4 @@ MyDerivedClassI::opMDict2(ICE_IN(Test::StringStringD) p1, Test::StringStringD& p return p1; } +#endif
\ No newline at end of file |