3 files changed, 15 insertions, 15 deletions

diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index ae230990a4b..07fc0a07cf4 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -44,7 +44,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     cin.getline(&c, 1);
 
     SimplePtr simple = initial->getSimple();
-    cout << "==> " << simple->_message << endl;
+    cout << "==> " << simple->message << endl;
 
     cout << '\n'
 	 << "Ok, this worked. Now let's try to transfer an object for a class\n"
@@ -75,7 +75,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     communicator->addObjectFactory(factory, "::Printer");
 
     initial->getPrinter(printer, printerProxy);
-    cout << "==> " << printer->_message << endl;
+    cout << "==> " << printer->message << endl;
 
     cout << '\n'
 	 << "Cool, it worked! Let's try calling the printBackwards() method\n"
@@ -135,7 +135,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	 << "[press enter]\n";
     cin.getline(&c, 1);
 
-    cout << "==> " << derived->_derivedMessage << endl;
+    cout << "==> " << derived->derivedMessage << endl;
     cout << "==> ";
     derived->printUppercase();
 
@@ -156,7 +156,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	assert(derived);
     }
 
-    cout << "==> " << derived->_derivedMessage << endl;
+    cout << "==> " << derived->derivedMessage << endl;
     cout << "==> ";
     derived->printUppercase();
 
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index 8dbe0e42b88..4c5c860ecf7 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -13,18 +13,18 @@
 
 class Simple
 {
-    string _message;
+    string message;
 };
 
 class Printer
 {
-    string _message;
+    string message;
     void printBackwards();
 };
 
 class DerivedPrinter extends Printer
 {
-    string _derivedMessage;
+    string derivedMessage;
     void printUppercase();
 };
 
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index c594db07d09..19df231608a 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -17,15 +17,15 @@ InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) :
     _adapter(adapter)
 {
     _simple = new Simple;
-    _simple->_message = "a message 4 u";
+    _simple->message = "a message 4 u";
 
     _printer = new PrinterI;
-    _printer->_message = "Ice rulez!";
+    _printer->message = "Ice rulez!";
     _printerProxy = PrinterPrx::uncheckedCast(adapter->addWithUUID(_printer));
 
     _derivedPrinter = new DerivedPrinterI;
-    _derivedPrinter->_message = _printer->_message;
-    _derivedPrinter->_derivedMessage = "Coming soon: the ultimate online game from MutableRealms!";
+    _derivedPrinter->message = _printer->message;
+    _derivedPrinter->derivedMessage = "Coming soon: the ultimate online game from MutableRealms!";
     adapter->addWithUUID(_derivedPrinter);
 }
 
@@ -60,8 +60,8 @@ void
 PrinterI::printBackwards(const Ice::Current&)
 {
     string s;
-    s.resize(_message.length());
-    reverse_copy(_message.begin(), _message.end(), s.begin());
+    s.resize(message.length());
+    reverse_copy(message.begin(), message.end(), s.begin());
     cout << s << endl;
 }
 
@@ -69,7 +69,7 @@ void
 DerivedPrinterI::printUppercase(const Ice::Current&)
 {
     string s;
-    s.resize(_derivedMessage.length());
-    transform(_derivedMessage.begin(), _derivedMessage.end(), s.begin(), toupper);
+    s.resize(derivedMessage.length());
+    transform(derivedMessage.begin(), derivedMessage.end(), s.begin(), toupper);
     cout << s << endl;
 }