Revert "Replaced double and triple underscores in C++ by ice-prefixed names"

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

1 files changed, 5 insertions, 5 deletions

diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 0be6d1e4359..ff890e9aedd 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -24,7 +24,7 @@ public:
 
     std::string str() const;
 
-    std::ostringstream& iceStr(); // For internal use only. Don't use in your code.
+    std::ostringstream& __str(); // For internal use only. Don't use in your code.
 
 private:
 
@@ -48,7 +48,7 @@ struct LoggerOutputInserter
     static inline LoggerOutputBase&
     insert(LoggerOutputBase& out, const T& val)
     {
-        out.iceStr() << val;
+        out.__str() << val;
         return out;
     }
 };
@@ -87,7 +87,7 @@ operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
 inline LoggerOutputBase&
 operator<<(LoggerOutputBase& out, const ::std::exception& ex)
 {
-    out.iceStr() << ex.what();
+    out.__str() << ex.what();
     return out;
 }
 
@@ -108,13 +108,13 @@ public:
 
     inline void flush()
     {
-        std::string s = iceStr().str();
+        std::string s = __str().str();
         if(!s.empty())
         {
             L& ref = *_logger;
             (ref.*output)(s);
         }
-        iceStr().str("");
+        __str().str("");
     }
 
 private: