summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/operations/TestAMDI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-02-10 12:59:45 +0100
committerJose <jose@zeroc.com>2017-02-10 12:59:45 +0100
commite9ff04cb3f82eed72e325f7c51b42e56a9b1daba (patch)
tree62990984c0e933e348390728f9970bc63127b27f /cpp/test/Ice/operations/TestAMDI.cpp
parentFixed (ICE-7540) - IceGridGUI discovers unreachable locators (diff)
downloadice-e9ff04cb3f82eed72e325f7c51b42e56a9b1daba.tar.bz2
ice-e9ff04cb3f82eed72e325f7c51b42e56a9b1daba.tar.xz
ice-e9ff04cb3f82eed72e325f7c51b42e56a9b1daba.zip
Emit deprecated warnings for classes implementing interfaces
Diffstat (limited to 'cpp/test/Ice/operations/TestAMDI.cpp')
-rw-r--r--cpp/test/Ice/operations/TestAMDI.cpp15
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