scope fixes

8 files changed, 56 insertions, 56 deletions

diff --git a/cpp/demo/Freeze/bench/bench.dsp b/cpp/demo/Freeze/bench/bench.dsp
index c2facad9a76..6d0e0ce5628 100644
--- a/cpp/demo/Freeze/bench/bench.dsp
+++ b/cpp/demo/Freeze/bench/bench.dsp
@@ -129,7 +129,7 @@ InputPath=.\Test.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe Test.ice \

-	..\..\..\bin\slice2freeze.exe --dict IntIntMap,int,int --dict Struct1Struct2Map,Struct1,Struct2 --dict Struct1Class1Map,Struct1,Class1 --dict Struct1ObjectMap,Struct1,Object BenchTypes Test.ice \

+	..\..\..\bin\slice2freeze.exe --dict IntIntMap,int,int --dict Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Struct1ObjectMap,Demo::Struct1,Demo::Object BenchTypes Test.ice \

 	

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -153,7 +153,7 @@ InputPath=.\Test.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe Test.ice \

-	..\..\..\bin\slice2freeze.exe --dict IntIntMap,int,int --dict Struct1Struct2Map,Struct1,Struct2 --dict Struct1Class1Map,Struct1,Class1 --dict Struct1ObjectMap,Struct1,Object BenchTypes Test.ice \

+	..\..\..\bin\slice2freeze.exe --dict IntIntMap,int,int --dict Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Struct1ObjectMap,Demo::Struct1,Object BenchTypes Test.ice \

 	

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index 75f36548c20..e5b3c4c68df 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -52,7 +52,7 @@ BookI::destroy(const Ice::Current&)
     }
 }
 
-::BookDescription
+Demo::BookDescription
 BookI::getBookDescription(const Ice::Current&) const
 {
     IceUtil::RWRecMutex::RLock sync(*this);
@@ -166,8 +166,8 @@ LibraryI::~LibraryI()
 {
 }
 
-::BookPrx
-LibraryI::createBook(const ::BookDescription& description, const Ice::Current& c)
+Demo::BookPrx
+LibraryI::createBook(const Demo::BookDescription& description, const Ice::Current& c)
 {
     IceUtil::RWRecMutex::WLock sync(*this);
 
@@ -228,7 +228,7 @@ LibraryI::createBook(const ::BookDescription& description, const Ice::Current& c
     return book;
 }
 
-::BookPrx
+Demo::BookPrx
 LibraryI::findByIsbn(const string& isbn, const Ice::Current& c) const
 {
     //
@@ -252,7 +252,7 @@ LibraryI::findByIsbn(const string& isbn, const Ice::Current& c) const
     }
 }
 
-::BookPrxSeq
+Demo::BookPrxSeq
 LibraryI::findByAuthors(const string& authors, const Ice::Current& c) const
 {
     IceUtil::RWRecMutex::RLock sync(*this);
diff --git a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
index 22409855d4a..41b2485619d 100644
--- a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
@@ -212,7 +212,7 @@ InputPath=.\PhoneBook.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \

-	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \

+	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \

 	

 

 "PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -236,7 +236,7 @@ InputPath=.\PhoneBook.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \

-	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \

+	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \

 	

 

 "PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index 849f38fb8f6..2acebe62eb9 100644
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -145,7 +145,7 @@ InputPath=.\PhoneBook.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \

-	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \

+	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \

 	

 

 "PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -169,7 +169,7 @@ InputPath=.\PhoneBook.ice
 

 BuildCmds= \

 	..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \

-	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \

+	..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice \

 	

 

 "PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp b/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
index 7292f32a26e..2d833a31f5a 100644
--- a/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
+++ b/cpp/test/FreezeScript/dbmap/freezescriptdbmap.dsp
@@ -128,7 +128,7 @@ USERDEP__INTSMAP="..\..\..\bin\slice2freeze.exe"	"..\..\..\lib\slice.lib"
 InputPath=TestOld.ice

 

 BuildCmds= \

-	..\..\..\bin\slice2freeze.exe --dict IntSMap,int,::S IntSMap TestOld.ice \

+	..\..\..\bin\slice2freeze.exe --dict IntSMap,int,Test::S IntSMap TestOld.ice \

 	

 

 "IntSMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -145,7 +145,7 @@ USERDEP__INTSMAP="..\..\..\bin\slice2freeze.exe"
 InputPath=TestOld.ice

 

 BuildCmds= \

-	..\..\..\bin\slice2freeze.exe --dict IntSMap,int,::S IntSMap TestOld.ice \

+	..\..\..\bin\slice2freeze.exe --dict IntSMap,int,Test::S IntSMap TestOld.ice \

 	

 

 "IntSMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index 2f342005577..10da703a398 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
@@ -18,7 +18,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter) :
 }
 
 void
-TestI::baseAsBase_async(const ::AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Current&)
+TestI::baseAsBase_async(const AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Current&)
 {
     Base b;
     b.b = "Base.b";
@@ -26,7 +26,7 @@ TestI::baseAsBase_async(const ::AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Cur
 }
 
 void
-TestI::unknownDerivedAsBase_async(const ::AMD_TestIntf_unknownDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownDerivedAsBase_async(const AMD_TestIntf_unknownDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownDerived d;
     d.b = "UnknownDerived.b";
@@ -35,7 +35,7 @@ TestI::unknownDerivedAsBase_async(const ::AMD_TestIntf_unknownDerivedAsBasePtr&
 }
 
 void
-TestI::knownDerivedAsBase_async(const ::AMD_TestIntf_knownDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownDerivedAsBase_async(const AMD_TestIntf_knownDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownDerived d;
     d.b = "KnownDerived.b";
@@ -44,7 +44,7 @@ TestI::knownDerivedAsBase_async(const ::AMD_TestIntf_knownDerivedAsBasePtr& cb,
 }
 
 void
-TestI::knownDerivedAsKnownDerived_async(const ::AMD_TestIntf_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&)
+TestI::knownDerivedAsKnownDerived_async(const AMD_TestIntf_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&)
 {
     KnownDerived d;
     d.b = "KnownDerived.b";
@@ -53,7 +53,7 @@ TestI::knownDerivedAsKnownDerived_async(const ::AMD_TestIntf_knownDerivedAsKnown
 }
 
 void
-TestI::unknownIntermediateAsBase_async(const ::AMD_TestIntf_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownIntermediateAsBase_async(const AMD_TestIntf_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownIntermediate ui;
     ui.b = "UnknownIntermediate.b";
@@ -62,7 +62,7 @@ TestI::unknownIntermediateAsBase_async(const ::AMD_TestIntf_unknownIntermediateA
 }
 
 void
-TestI::knownIntermediateAsBase_async(const ::AMD_TestIntf_knownIntermediateAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownIntermediateAsBase_async(const AMD_TestIntf_knownIntermediateAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownIntermediate ki;
     ki.b = "KnownIntermediate.b";
@@ -71,7 +71,7 @@ TestI::knownIntermediateAsBase_async(const ::AMD_TestIntf_knownIntermediateAsBas
 }
 
 void
-TestI::knownMostDerivedAsBase_async(const ::AMD_TestIntf_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::knownMostDerivedAsBase_async(const AMD_TestIntf_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     KnownMostDerived kmd;
     kmd.b = "KnownMostDerived.b";
@@ -81,7 +81,7 @@ TestI::knownMostDerivedAsBase_async(const ::AMD_TestIntf_knownMostDerivedAsBaseP
 }
 
 void
-TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr& cb,
+TestI::knownIntermediateAsKnownIntermediate_async(const AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr& cb,
 	                                          const ::Ice::Current&)
 {
     KnownIntermediate ki;
@@ -91,7 +91,7 @@ TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_TestIntf_knownInte
 }
 
 void
-TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr& cb,
+TestI::knownMostDerivedAsKnownIntermediate_async(const AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr& cb,
 	                                         const ::Ice::Current&)
 {
     KnownMostDerived kmd;
@@ -103,7 +103,7 @@ TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_TestIntf_knownMostD
 
 void
 TestI::
-knownMostDerivedAsKnownMostDerived_async(const ::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr& cb,
+knownMostDerivedAsKnownMostDerived_async(const AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr& cb,
 	                                 const ::Ice::Current&)
 {
     KnownMostDerived kmd;
@@ -114,7 +114,7 @@ knownMostDerivedAsKnownMostDerived_async(const ::AMD_TestIntf_knownMostDerivedAs
 }
 
 void
-TestI::unknownMostDerived1AsBase_async(const ::AMD_TestIntf_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownMostDerived1AsBase_async(const AMD_TestIntf_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownMostDerived1 umd1;
     umd1.b = "UnknownMostDerived1.b";
@@ -124,7 +124,7 @@ TestI::unknownMostDerived1AsBase_async(const ::AMD_TestIntf_unknownMostDerived1A
 }
 
 void
-TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr& cb,
+TestI::unknownMostDerived1AsKnownIntermediate_async(const AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr& cb,
 	                                            const ::Ice::Current&)
 {
     UnknownMostDerived1 umd1;
@@ -135,7 +135,7 @@ TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_TestIntf_unknown
 }
 
 void
-TestI::unknownMostDerived2AsBase_async(const ::AMD_TestIntf_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&)
+TestI::unknownMostDerived2AsBase_async(const AMD_TestIntf_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&)
 {
     UnknownMostDerived2 umd2;
     umd2.b = "UnknownMostDerived2.b";
@@ -145,7 +145,7 @@ TestI::unknownMostDerived2AsBase_async(const ::AMD_TestIntf_unknownMostDerived2A
 }
 
 void
-TestI::shutdown_async(const ::AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&)
+TestI::shutdown_async(const AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&)
 {
     _adapter->getCommunicator()->shutdown();
     cb->ice_response();
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index eb42882f8fc..dfdd7907108 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
@@ -19,7 +19,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter) :
 }
 
 void
-TestI::SBaseAsObject_async(const ::AMD_TestIntf_SBaseAsObjectPtr& cb, const ::Ice::Current&)
+TestI::SBaseAsObject_async(const AMD_TestIntf_SBaseAsObjectPtr& cb, const ::Ice::Current&)
 {
     SBasePtr sb = new SBase;
     sb->sb = "SBase.sb";
@@ -27,7 +27,7 @@ TestI::SBaseAsObject_async(const ::AMD_TestIntf_SBaseAsObjectPtr& cb, const ::Ic
 }
 
 void
-TestI::SBaseAsSBase_async(const ::AMD_TestIntf_SBaseAsSBasePtr& cb, const ::Ice::Current&)
+TestI::SBaseAsSBase_async(const AMD_TestIntf_SBaseAsSBasePtr& cb, const ::Ice::Current&)
 {
     SBasePtr sb = new SBase;
     sb->sb = "SBase.sb";
@@ -35,7 +35,7 @@ TestI::SBaseAsSBase_async(const ::AMD_TestIntf_SBaseAsSBasePtr& cb, const ::Ice:
 }
 
 void
-TestI::SBSKnownDerivedAsSBase_async(const ::AMD_TestIntf_SBSKnownDerivedAsSBasePtr& cb, const ::Ice::Current&)
+TestI::SBSKnownDerivedAsSBase_async(const AMD_TestIntf_SBSKnownDerivedAsSBasePtr& cb, const ::Ice::Current&)
 {
     SBSKnownDerivedPtr sbskd = new SBSKnownDerived;
     sbskd->sb = "SBSKnownDerived.sb";
@@ -44,7 +44,7 @@ TestI::SBSKnownDerivedAsSBase_async(const ::AMD_TestIntf_SBSKnownDerivedAsSBaseP
 }
 
 void
-TestI::SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr& cb,
+TestI::SBSKnownDerivedAsSBSKnownDerived_async(const AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr& cb,
 	                                      const ::Ice::Current&)
 {
     SBSKnownDerivedPtr sbskd = new SBSKnownDerived;
@@ -54,7 +54,7 @@ TestI::SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_TestIntf_SBSKnownDeriv
 }
 
 void
-TestI::SBSUnknownDerivedAsSBase_async(const ::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr& cb, const ::Ice::Current&)
+TestI::SBSUnknownDerivedAsSBase_async(const AMD_TestIntf_SBSUnknownDerivedAsSBasePtr& cb, const ::Ice::Current&)
 {
     SBSUnknownDerivedPtr sbsud = new SBSUnknownDerived;
     sbsud->sb = "SBSUnknownDerived.sb";
@@ -63,7 +63,7 @@ TestI::SBSUnknownDerivedAsSBase_async(const ::AMD_TestIntf_SBSUnknownDerivedAsSB
 }
 
 void
-TestI::SUnknownAsObject_async(const ::AMD_TestIntf_SUnknownAsObjectPtr& cb, const ::Ice::Current&)
+TestI::SUnknownAsObject_async(const AMD_TestIntf_SUnknownAsObjectPtr& cb, const ::Ice::Current&)
 {
     SUnknownPtr su = new SUnknown;
     su->su = "SUnknown.su";
@@ -71,7 +71,7 @@ TestI::SUnknownAsObject_async(const ::AMD_TestIntf_SUnknownAsObjectPtr& cb, cons
 }
 
 void
-TestI::oneElementCycle_async(const ::AMD_TestIntf_oneElementCyclePtr& cb, const ::Ice::Current&)
+TestI::oneElementCycle_async(const AMD_TestIntf_oneElementCyclePtr& cb, const ::Ice::Current&)
 {
     BPtr b = new B;
     b->sb = "B1.sb";
@@ -80,7 +80,7 @@ TestI::oneElementCycle_async(const ::AMD_TestIntf_oneElementCyclePtr& cb, const
 }
 
 void
-TestI::twoElementCycle_async(const ::AMD_TestIntf_twoElementCyclePtr& cb, const ::Ice::Current&)
+TestI::twoElementCycle_async(const AMD_TestIntf_twoElementCyclePtr& cb, const ::Ice::Current&)
 {
     BPtr b1 = new B;
     b1->sb = "B1.sb";
@@ -92,7 +92,7 @@ TestI::twoElementCycle_async(const ::AMD_TestIntf_twoElementCyclePtr& cb, const
 }
 
 void
-TestI::D1AsB_async(const ::AMD_TestIntf_D1AsBPtr& cb, const ::Ice::Current&)
+TestI::D1AsB_async(const AMD_TestIntf_D1AsBPtr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -108,7 +108,7 @@ TestI::D1AsB_async(const ::AMD_TestIntf_D1AsBPtr& cb, const ::Ice::Current&)
 }
 
 void
-TestI::D1AsD1_async(const ::AMD_TestIntf_D1AsD1Ptr& cb, const ::Ice::Current&)
+TestI::D1AsD1_async(const AMD_TestIntf_D1AsD1Ptr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -124,7 +124,7 @@ TestI::D1AsD1_async(const ::AMD_TestIntf_D1AsD1Ptr& cb, const ::Ice::Current&)
 }
 
 void
-TestI::D2AsB_async(const ::AMD_TestIntf_D2AsBPtr& cb, const ::Ice::Current&)
+TestI::D2AsB_async(const AMD_TestIntf_D2AsBPtr& cb, const ::Ice::Current&)
 {
     D2Ptr d2 = new D2;
     d2->sb = "D2.sb";
@@ -140,7 +140,7 @@ TestI::D2AsB_async(const ::AMD_TestIntf_D2AsBPtr& cb, const ::Ice::Current&)
 }
 
 void
-TestI::paramTest1_async(const ::AMD_TestIntf_paramTest1Ptr& cb, const ::Ice::Current&)
+TestI::paramTest1_async(const AMD_TestIntf_paramTest1Ptr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -156,7 +156,7 @@ TestI::paramTest1_async(const ::AMD_TestIntf_paramTest1Ptr& cb, const ::Ice::Cur
 }
 
 void
-TestI::paramTest2_async(const ::AMD_TestIntf_paramTest2Ptr& cb, const ::Ice::Current&)
+TestI::paramTest2_async(const AMD_TestIntf_paramTest2Ptr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -172,7 +172,7 @@ TestI::paramTest2_async(const ::AMD_TestIntf_paramTest2Ptr& cb, const ::Ice::Cur
 }
 
 void
-TestI::paramTest3_async(const ::AMD_TestIntf_paramTest3Ptr& cb, const ::Ice::Current&)
+TestI::paramTest3_async(const AMD_TestIntf_paramTest3Ptr& cb, const ::Ice::Current&)
 {
     D2Ptr d2 = new D2;
     d2->sb = "D2.sb (p1 1)";
@@ -202,7 +202,7 @@ TestI::paramTest3_async(const ::AMD_TestIntf_paramTest3Ptr& cb, const ::Ice::Cur
 }
 
 void
-TestI::paramTest4_async(const ::AMD_TestIntf_paramTest4Ptr& cb, const ::Ice::Current&)
+TestI::paramTest4_async(const AMD_TestIntf_paramTest4Ptr& cb, const ::Ice::Current&)
 {
     D4Ptr d4 = new D4;
     d4->sb = "D4.sb (1)";
@@ -215,7 +215,7 @@ TestI::paramTest4_async(const ::AMD_TestIntf_paramTest4Ptr& cb, const ::Ice::Cur
 }
 
 void
-TestI::returnTest1_async(const ::AMD_TestIntf_returnTest1Ptr& cb, const ::Ice::Current&)
+TestI::returnTest1_async(const AMD_TestIntf_returnTest1Ptr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -231,7 +231,7 @@ TestI::returnTest1_async(const ::AMD_TestIntf_returnTest1Ptr& cb, const ::Ice::C
 }
 
 void
-TestI::returnTest2_async(const ::AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::Current&)
+TestI::returnTest2_async(const AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::Current&)
 {
     D1Ptr d1 = new D1;
     d1->sb = "D1.sb";
@@ -247,13 +247,13 @@ TestI::returnTest2_async(const ::AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::C
 }
 
 void
-TestI::returnTest3_async(const ::AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr& p2, const ::Ice::Current&)
+TestI::returnTest3_async(const AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr& p2, const ::Ice::Current&)
 {
     cb->ice_response(p1);
 }
 
 void
-TestI::sequenceTest_async(const ::AMD_TestIntf_sequenceTestPtr& cb,
+TestI::sequenceTest_async(const AMD_TestIntf_sequenceTestPtr& cb,
 	                  const SS1Ptr& p1, const SS2Ptr& p2, const ::Ice::Current&)
 {
     SS ss;
@@ -263,7 +263,7 @@ TestI::sequenceTest_async(const ::AMD_TestIntf_sequenceTestPtr& cb,
 }
 
 void
-TestI::dictionaryTest_async(const ::AMD_TestIntf_dictionaryTestPtr& cb, const ::BDict& bin, const ::Ice::Current&)
+TestI::dictionaryTest_async(const AMD_TestIntf_dictionaryTestPtr& cb, const BDict& bin, const ::Ice::Current&)
 {
     BDict bout;
     int i;
@@ -293,7 +293,7 @@ TestI::dictionaryTest_async(const ::AMD_TestIntf_dictionaryTestPtr& cb, const ::
 }
 
 void
-TestI::throwBaseAsBase_async(const ::AMD_TestIntf_throwBaseAsBasePtr& cb, const ::Ice::Current&)
+TestI::throwBaseAsBase_async(const AMD_TestIntf_throwBaseAsBasePtr& cb, const ::Ice::Current&)
 {
     BaseException be;
     be.sbe = "sbe";
@@ -304,7 +304,7 @@ TestI::throwBaseAsBase_async(const ::AMD_TestIntf_throwBaseAsBasePtr& cb, const
 }
 
 void
-TestI::throwDerivedAsBase_async(const ::AMD_TestIntf_throwDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::throwDerivedAsBase_async(const AMD_TestIntf_throwDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     DerivedException de;
     de.sbe = "sbe";
@@ -321,7 +321,7 @@ TestI::throwDerivedAsBase_async(const ::AMD_TestIntf_throwDerivedAsBasePtr& cb,
 }
 
 void
-TestI::throwDerivedAsDerived_async(const ::AMD_TestIntf_throwDerivedAsDerivedPtr& cb, const ::Ice::Current&)
+TestI::throwDerivedAsDerived_async(const AMD_TestIntf_throwDerivedAsDerivedPtr& cb, const ::Ice::Current&)
 {
     DerivedException de;
     de.sbe = "sbe";
@@ -338,7 +338,7 @@ TestI::throwDerivedAsDerived_async(const ::AMD_TestIntf_throwDerivedAsDerivedPtr
 }
 
 void
-TestI::throwUnknownDerivedAsBase_async(const ::AMD_TestIntf_throwUnknownDerivedAsBasePtr& cb, const ::Ice::Current&)
+TestI::throwUnknownDerivedAsBase_async(const AMD_TestIntf_throwUnknownDerivedAsBasePtr& cb, const ::Ice::Current&)
 {
     D2Ptr d2 = new D2;
     d2->sb = "sb d2";
@@ -355,7 +355,7 @@ TestI::throwUnknownDerivedAsBase_async(const ::AMD_TestIntf_throwUnknownDerivedA
 }
 
 void
-TestI::useForward_async(const ::AMD_TestIntf_useForwardPtr& cb, const ::Ice::Current&)
+TestI::useForward_async(const AMD_TestIntf_useForwardPtr& cb, const ::Ice::Current&)
 {
     ForwardPtr f = new Forward;
     f->h = new Hidden;
@@ -364,7 +364,7 @@ TestI::useForward_async(const ::AMD_TestIntf_useForwardPtr& cb, const ::Ice::Cur
 }
 
 void
-TestI::shutdown_async(const ::AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&)
+TestI::shutdown_async(const AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&)
 {
     _adapter->getCommunicator()->shutdown();
     cb->ice_response();
diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp
index db9e6b4d9f4..99a4ef40e74 100644
--- a/cpp/test/Ice/slicing/objects/TestI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestI.cpp
@@ -239,8 +239,8 @@ TestI::sequenceTest(const SS1Ptr& p1, const SS2Ptr& p2, const ::Ice::Current&)
     return ss;
 }
 
-::BDict
-TestI::dictionaryTest(const ::BDict& bin, ::BDict& bout, const ::Ice::Current&)
+Test::BDict
+TestI::dictionaryTest(const BDict& bin, BDict& bout, const ::Ice::Current&)
 {
     int i;
     for(i = 0; i < 10; ++i)
@@ -331,7 +331,7 @@ TestI::throwUnknownDerivedAsBase(const ::Ice::Current&)
 }
 
 void
-TestI::useForward(::ForwardPtr& f, const ::Ice::Current&)
+TestI::useForward(ForwardPtr& f, const ::Ice::Current&)
 {
     f = new Forward;
     f->h = new Hidden;