Got tripped up by the style guide again and change "_mem" to "Mem" :-)

3 files changed, 37 insertions, 37 deletions

diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 397e0f31ed9..77a1f7f60a4 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -69,7 +69,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const A& ex)
     {
-	test(ex.a_mem == 1);
+	test(ex.aMem == 1);
     }
     catch (...)
     {
@@ -83,7 +83,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const A& ex)
     {
-	test(ex.a_mem == 1);
+	test(ex.aMem == 1);
     }
     catch (...)
     {
@@ -97,7 +97,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const D& ex)
     {
-	test(ex.d_mem == -1);
+	test(ex.dMem == -1);
     }
     catch (...)
     {
@@ -111,8 +111,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const B& ex)
     {
-	test(ex.a_mem == 1);
-	test(ex.b_mem == 2);
+	test(ex.aMem == 1);
+	test(ex.bMem == 2);
     }
     catch (...)
     {
@@ -126,9 +126,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const C& ex)
     {
-	test(ex.a_mem == 1);
-	test(ex.b_mem == 2);
-	test(ex.c_mem == 3);
+	test(ex.aMem == 1);
+	test(ex.bMem == 2);
+	test(ex.cMem == 3);
     }
     catch (...)
     {
@@ -146,7 +146,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const A& ex)
     {
-	test(ex.a_mem == 1);
+	test(ex.aMem == 1);
     }
     catch (...)
     {
@@ -160,8 +160,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const B& ex)
     {
-	test(ex.a_mem == 1);
-	test(ex.b_mem == 2);
+	test(ex.aMem == 1);
+	test(ex.bMem == 2);
     }
     catch (...)
     {
@@ -235,8 +235,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const B& ex)
     {
-	test(ex.a_mem == 1);
-	test(ex.b_mem == 2);
+	test(ex.aMem == 1);
+	test(ex.bMem == 2);
     }
     catch (...)
     {
@@ -250,9 +250,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const C& ex)
     {
-	test(ex.a_mem == 1);
-    	test(ex.b_mem == 2);
-    	test(ex.c_mem == 3);
+	test(ex.aMem == 1);
+    	test(ex.bMem == 2);
+    	test(ex.cMem == 3);
     }
     catch (...)
     {
@@ -266,9 +266,9 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     catch(const C& ex)
     {
-	test(ex.a_mem == 1);
-	test(ex.b_mem == 2);
-	test(ex.c_mem == 3);
+	test(ex.aMem == 1);
+	test(ex.bMem == 2);
+	test(ex.cMem == 3);
     }
     catch (...)
     {
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index a20370be121..a6742e5f0d0 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/Test.ice
@@ -15,22 +15,22 @@ interface Thrower;
 
 exception A
 {
-    int a_mem;
+    int aMem;
 };
 
 exception B extends A
 {
-    int b_mem;
+    int bMem;
 };
 
 exception C extends B
 {
-    int c_mem;
+    int cMem;
 };
 
 exception D
 {
-    int d_mem;
+    int dMem;
 };
 
 interface Thrower
diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index b9effcb6971..613c8643b2f 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/TestI.cpp
@@ -26,7 +26,7 @@ void
 ThrowerI::throwAasA(Ice::Int a, const Ice::Current&)
 {
     A ex;
-    ex.a_mem = a;
+    ex.aMem = a;
     throw ex;
 }
 
@@ -36,13 +36,13 @@ ThrowerI::throwAorDasAorD(Ice::Int a, const Ice::Current&)
     if(a > 0)
     {
 	A ex;
-	ex.a_mem = a;
+	ex.aMem = a;
 	throw ex;
     }
     else
     {
 	D ex;
-	ex.d_mem = a;
+	ex.dMem = a;
 	throw ex;
     }
 }
@@ -63,8 +63,8 @@ void
 ThrowerI::throwBasB(Ice::Int a, Ice::Int b, const Ice::Current&)
 {
     B ex;
-    ex.a_mem = a;
-    ex.b_mem = b;
+    ex.aMem = a;
+    ex.bMem = b;
     throw ex;
 }
 
@@ -78,9 +78,9 @@ void
 ThrowerI::throwCasC(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&)
 {
     C ex;
-    ex.a_mem = a;
-    ex.b_mem = b;
-    ex.c_mem = c;
+    ex.aMem = a;
+    ex.bMem = b;
+    ex.cMem = c;
     throw ex;
 }
 
@@ -94,7 +94,7 @@ void
 ThrowerI::throwUndeclaredA(Ice::Int a, const Ice::Current&)
 {
     A ex;
-    ex.a_mem = a;
+    ex.aMem = a;
     throw ex;
 }
 
@@ -102,8 +102,8 @@ void
 ThrowerI::throwUndeclaredB(Ice::Int a, Ice::Int b, const Ice::Current&)
 {
     B ex;
-    ex.a_mem = a;
-    ex.b_mem = b;
+    ex.aMem = a;
+    ex.bMem = b;
     throw ex;
 }
 
@@ -111,9 +111,9 @@ void
 ThrowerI::throwUndeclaredC(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&)
 {
     C ex;
-    ex.a_mem = a;
-    ex.b_mem = b;
-    ex.c_mem = c;
+    ex.aMem = a;
+    ex.bMem = b;
+    ex.cMem = c;
     throw ex;
 }