diff options
Diffstat (limited to 'cpp/test/Ice/operations/TestAMDI.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/TestAMDI.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index baea3211706..57eb91887de 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -27,7 +27,7 @@ MyDerivedClassI::ice_isA(ICE_IN(string) id, const Ice::Current& current) const { test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); #ifdef ICE_CPP11_MAPPING - return Test::MyDerivedClassDisp::ice_isA(move(id), current); + return Test::MyDerivedClass::ice_isA(move(id), current); #else return Test::MyDerivedClass::ice_isA(id, current); #endif @@ -37,22 +37,15 @@ void MyDerivedClassI::ice_ping(const Ice::Current& current) const { test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); -#ifdef ICE_CPP11_MAPPING - Test::MyDerivedClassDisp::ice_ping(current); -#else Test::MyDerivedClass::ice_ping(current); -#endif + } std::vector<std::string> MyDerivedClassI::ice_ids(const Ice::Current& current) const { test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); -#ifdef ICE_CPP11_MAPPING - return Test::MyDerivedClassDisp::ice_ids(current); -#else return Test::MyDerivedClass::ice_ids(current); -#endif } #ifdef ICE_CPP11_MAPPING @@ -63,11 +56,7 @@ const std::string& MyDerivedClassI::ice_id(const Ice::Current& current) const { test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); -#ifdef ICE_CPP11_MAPPING - return Test::MyDerivedClassDisp::ice_id(current); -#else return Test::MyDerivedClass::ice_id(current); -#endif } #ifdef ICE_CPP11_MAPPING |