Merged Mark's pythonami branch

3 files changed, 2 insertions, 6 deletions

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 1e36c4dae0e..32bc0f641c2 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1716,7 +1716,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 
         cout << "ok" << endl;
 
-        cout << "catching unknown non-Ice exception with AMI... " << flush;
+        cout << "catching unknown non-Ice exception with new AMI mapping... " << flush;
 
         {
             CallbackPtr cb = new Callback;
diff --git a/cpp/test/Ice/operations/OnewaysNewAMI.cpp b/cpp/test/Ice/operations/OnewaysNewAMI.cpp
index c8f6517edb6..81c94753bb6 100644
--- a/cpp/test/Ice/operations/OnewaysNewAMI.cpp
+++ b/cpp/test/Ice/operations/OnewaysNewAMI.cpp
@@ -65,10 +65,6 @@ public:
     {
     }
 
-    void opByte(Ice::Byte b, Ice::Byte b1)
-    {
-    }
-
     void sent(bool)
     {
         called();
diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice
index c8e4a27fbba..6397c434802 100644
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/Test.ice
@@ -67,7 +67,7 @@ exception DerivedException extends BaseException
     D1 pd1;
 };
 
-class Forward;          // Forward-declared class defined in another compilation unit
+class Forward;          /* Forward-declared class defined in another compilation unit */
 
 ["ami"] interface TestIntf
 {