4 files changed, 16 insertions, 16 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 1d9b09e017e..c738f915876 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -29,9 +29,9 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
 {
 }
 
-static string ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
+static const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
 
-const string&
+const char*
 CtrlCHandlerException::ice_name() const
 {
     return ctrlCHandlerName;
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 35597b1eeec..12bbe20059c 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -34,9 +34,9 @@ IceUtil::Exception::~Exception()
 {
 }
 
-string IceUtil::Exception::_name = "IceUtil::Exception";
+const char* IceUtil::Exception::_name = "IceUtil::Exception";
 
-const string&
+const char*
 IceUtil::Exception::ice_name() const
 {
     return _name;
@@ -92,9 +92,9 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
     }
 }
 
-string IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
+const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
 
-const string&
+const char*
 IceUtil::NullHandleException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 5cbd8326354..eb6a96f19b3 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -17,9 +17,9 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
 {
 }
     
-string IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
+const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
 
-const string&
+const char*
 IceUtil::ThreadSyscallException::ice_name() const
 {
     return _name;
@@ -85,9 +85,9 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
 {
 }
 
-string IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
+const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
 
-const string&
+const char*
 IceUtil::ThreadLockedException::ice_name() const
 {
     return _name;
@@ -110,9 +110,9 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
 {
 }
 
-string IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
+const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
 
-const string&
+const char*
 IceUtil::ThreadStartedException::ice_name() const
 {
     return _name;
@@ -135,9 +135,9 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
 {
 }
 
-string IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
+const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
 
-const string&
+const char*
 IceUtil::ThreadNotStartedException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index c72fd3ea6ad..430a82ffc01 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -55,7 +55,7 @@ IceUtil::UUIDGenerationException::UUIDGenerationException(const char* file, int
 {
 }
 
-string IceUtil::UUIDGenerationException::_name = "IceUtil::UUIDGenerationException";
+const char* IceUtil::UUIDGenerationException::_name = "IceUtil::UUIDGenerationException";
 
 #ifndef _WIN32
 //
@@ -99,7 +99,7 @@ static UUIDCleanup uuidCleanup;
 
 #endif
 
-const string&
+const char*
 IceUtil::UUIDGenerationException::ice_name() const
 {
     return _name;