diff options
| author | Jose <jose@zeroc.com> | 2015-12-10 10:06:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-10 10:06:12 +0100 |
| commit | bbde2ba93a56bb6adf4d06ecb2f0f5ca04eb308d (patch) | |
| tree | f0e9a5eb9287fb92a53a02ab34fa19b6325cc4a4 /cpp/test | |
| parent | C++11 mapping server side input parameter fixes (diff) | |
| download | ice-bbde2ba93a56bb6adf4d06ecb2f0f5ca04eb308d.tar.bz2 ice-bbde2ba93a56bb6adf4d06ecb2f0f5ca04eb308d.tar.xz ice-bbde2ba93a56bb6adf4d06ecb2f0f5ca04eb308d.zip | |
C++11 mapping server side input parameter fixes
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Slice/keyword/Client.cpp | 14 | ||||
| -rw-r--r-- | cpp/test/include/TestCommon.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index 138750fe97d..66ad4c054e4 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -16,7 +16,7 @@ using namespace std; class breakI : public _cpp_and::_cpp_break { public: - + #ifdef ICE_CPP11_MAPPING virtual void case_async(::Ice::Int, function<void (int)> response, @@ -50,7 +50,11 @@ public: class switchI: public _cpp_and::_cpp_switch { public: - virtual void foo(_cpp_and::charPrx, Ice::Int&, const ::Ice::Current&) +#ifdef ICE_CPP11_MAPPING + virtual void foo(shared_ptr<_cpp_and::charPrx>, Ice::Int&, const ::Ice::Current&) +#else + virtual void foo(const _cpp_and::charPrx&, Ice::Int&, const ::Ice::Current&) +#endif { } }; @@ -70,7 +74,7 @@ public: { } #endif - virtual void _cpp_explicit(const ::Ice::Current&) + virtual void _cpp_explicit(const ::Ice::Current&) { } virtual void foo(const _cpp_and::charPrx&, Ice::Int&, const ::Ice::Current&) @@ -82,7 +86,7 @@ class friendI : public _cpp_and::_cpp_friend { public: virtual _cpp_and::_cpp_auto - _cpp_goto(_cpp_and::_cpp_continue, + _cpp_goto(_cpp_and::_cpp_continue, const _cpp_and::_cpp_auto&, #ifdef ICE_CPP11_MAPPING const _cpp_and::_cpp_delete&, @@ -101,7 +105,7 @@ public: return _cpp_and::_cpp_auto(); } }; - + // // This section of the test is present to ensure that the C++ types // are named correctly. It is not expected to run. diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index 1341dd65f58..1a6261ee080 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -15,7 +15,7 @@ #ifdef ICE_CPP11_MAPPING # define ICE_IN(T) T #else -# define ICE_IN(T) const T##& +# define ICE_IN(T) const T& #endif #if defined(ICE_OS_WINRT) || (TARGET_OS_IPHONE) |