Deprecation of global Slice definitions.

1 files changed, 16 insertions, 14 deletions

diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index 9a54e0dc347..2f342005577 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
@@ -10,13 +10,15 @@
 #include <TestAMDI.h>
 #include <Ice/Ice.h>
 
+using namespace Test;
+
 TestI::TestI(const Ice::ObjectAdapterPtr& adapter) :
     _adapter(adapter)
 {
 }
 
 void
-TestI::baseAsBase_async(const ::AMD_Test_baseAsBasePtr& cb, const ::Ice::Current&)
+TestI::baseAsBase_async(const ::AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Current&)
 {
     Base b;
     b.b = "Base.b";
@@ -24,7 +26,7 @@ TestI::baseAsBase_async(const ::AMD_Test_baseAsBasePtr& cb, const ::Ice::Current
 }
 
 void
-TestI::unknownDerivedAsBase_async(const ::AMD_Test_unknownDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownDerivedAsBase_async(const ::AMD_TestIntf_unknownDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownDerived d;
     d.b = "UnknownDerived.b";
@@ -33,7 +35,7 @@ TestI::unknownDerivedAsBase_async(const ::AMD_Test_unknownDerivedAsBasePtr& cb,
 }
 
 void
-TestI::knownDerivedAsBase_async(const ::AMD_Test_knownDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownDerivedAsBase_async(const ::AMD_TestIntf_knownDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownDerived d;
     d.b = "KnownDerived.b";
@@ -42,7 +44,7 @@ TestI::knownDerivedAsBase_async(const ::AMD_Test_knownDerivedAsBasePtr& cb, cons
 }
 
 void
-TestI::knownDerivedAsKnownDerived_async(const ::AMD_Test_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&)
+TestI::knownDerivedAsKnownDerived_async(const ::AMD_TestIntf_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&)
 {
     KnownDerived d;
     d.b = "KnownDerived.b";
@@ -51,7 +53,7 @@ TestI::knownDerivedAsKnownDerived_async(const ::AMD_Test_knownDerivedAsKnownDeri
 }
 
 void
-TestI::unknownIntermediateAsBase_async(const ::AMD_Test_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownIntermediateAsBase_async(const ::AMD_TestIntf_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownIntermediate ui;
     ui.b = "UnknownIntermediate.b";
@@ -60,7 +62,7 @@ TestI::unknownIntermediateAsBase_async(const ::AMD_Test_unknownIntermediateAsBas
 }
 
 void
-TestI::knownIntermediateAsBase_async(const ::AMD_Test_knownIntermediateAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownIntermediateAsBase_async(const ::AMD_TestIntf_knownIntermediateAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownIntermediate ki;
     ki.b = "KnownIntermediate.b";
@@ -69,7 +71,7 @@ TestI::knownIntermediateAsBase_async(const ::AMD_Test_knownIntermediateAsBasePtr
 }
 
 void
-TestI::knownMostDerivedAsBase_async(const ::AMD_Test_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownMostDerivedAsBase_async(const ::AMD_TestIntf_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownMostDerived kmd;
     kmd.b = "KnownMostDerived.b";
@@ -79,7 +81,7 @@ TestI::knownMostDerivedAsBase_async(const ::AMD_Test_knownMostDerivedAsBasePtr&
 }
 
 void
-TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_Test_knownIntermediateAsKnownIntermediatePtr& cb,
+TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr& cb,
 	                                          const ::Ice::Current&)
 {
     KnownIntermediate ki;
@@ -89,7 +91,7 @@ TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_Test_knownIntermed
 }
 
 void
-TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_Test_knownMostDerivedAsKnownIntermediatePtr& cb,
+TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr& cb,
 	                                         const ::Ice::Current&)
 {
     KnownMostDerived kmd;
@@ -101,7 +103,7 @@ TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_Test_knownMostDeriv
 
 void
 TestI::
-knownMostDerivedAsKnownMostDerived_async(const ::AMD_Test_knownMostDerivedAsKnownMostDerivedPtr& cb,
+knownMostDerivedAsKnownMostDerived_async(const ::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr& cb,
 	                                 const ::Ice::Current&)
 {
     KnownMostDerived kmd;
@@ -112,7 +114,7 @@ knownMostDerivedAsKnownMostDerived_async(const ::AMD_Test_knownMostDerivedAsKnow
 }
 
 void
-TestI::unknownMostDerived1AsBase_async(const ::AMD_Test_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownMostDerived1AsBase_async(const ::AMD_TestIntf_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownMostDerived1 umd1;
     umd1.b = "UnknownMostDerived1.b";
@@ -122,7 +124,7 @@ TestI::unknownMostDerived1AsBase_async(const ::AMD_Test_unknownMostDerived1AsBas
 }
 
 void
-TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_Test_unknownMostDerived1AsKnownIntermediatePtr& cb,
+TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr& cb,
 	                                            const ::Ice::Current&)
 {
     UnknownMostDerived1 umd1;
@@ -133,7 +135,7 @@ TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_Test_unknownMost
 }
 
 void
-TestI::unknownMostDerived2AsBase_async(const ::AMD_Test_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownMostDerived2AsBase_async(const ::AMD_TestIntf_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownMostDerived2 umd2;
     umd2.b = "UnknownMostDerived2.b";
@@ -143,7 +145,7 @@ TestI::unknownMostDerived2AsBase_async(const ::AMD_Test_unknownMostDerived2AsBas
 }
 
 void
-TestI::shutdown_async(const ::AMD_Test_shutdownPtr& cb, const ::Ice::Current&)
+TestI::shutdown_async(const ::AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&)
 {
     _adapter->getCommunicator()->shutdown();
     cb->ice_response();