11 files changed, 17 insertions, 17 deletions
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index 2b76a9aae7c..519a3248682 100644
--- a/cpp/src/FreezeScript/Exception.cpp
+++ b/cpp/src/FreezeScript/Exception.cpp
@@ -21,7 +21,7 @@ FreezeScript::FailureException::FailureException(const char* file, int line, con
 
 const char* FreezeScript::FailureException::_name = "FreezeScript::FailureException";
 
-const char*
+const string
 FreezeScript::FailureException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
index 1c79f90c950..9bc6c10dc8b 100644
--- a/cpp/src/FreezeScript/Exception.h
+++ b/cpp/src/FreezeScript/Exception.h
@@ -20,7 +20,7 @@ class FailureException : public IceUtil::Exception
 public:
     
     FailureException(const char*, int, const std::string&);
-    virtual const char* ice_name() const;
+    virtual const std::string ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
     virtual void ice_throw() const;
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index f567f27d66a..99b11bd4ac8 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -128,7 +128,7 @@ FreezeScript::EvaluateException::EvaluateException(const char* file, int line, c
 
 const char* FreezeScript::EvaluateException::_name = "FreezeScript::EvaluateException";
 
-const char*
+const string
 FreezeScript::EvaluateException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
index 4c4af3bf9a9..da381850424 100644
--- a/cpp/src/FreezeScript/Parser.h
+++ b/cpp/src/FreezeScript/Parser.h
@@ -39,7 +39,7 @@ class EvaluateException : public IceUtil::Exception
 public:
     
     EvaluateException(const char*, int, const std::string&);
-    virtual const char* ice_name() const;
+    virtual const std::string ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
     virtual void ice_throw() const;
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index c738f915876..e6347d5eef9 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -31,7 +31,7 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
 
 static const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
 
-const char*
+const string
 CtrlCHandlerException::ice_name() const
 {
     return ctrlCHandlerName;
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 12bbe20059c..038bf203a14 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -36,7 +36,7 @@ IceUtil::Exception::~Exception()
 
 const char* IceUtil::Exception::_name = "IceUtil::Exception";
 
-const char*
+const string
 IceUtil::Exception::ice_name() const
 {
     return _name;
@@ -94,7 +94,7 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
 
 const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
 
-const char*
+const string
 IceUtil::NullHandleException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index eb6a96f19b3..abaa79f26a6 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -19,7 +19,7 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
     
 const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
 
-const char*
+const string
 IceUtil::ThreadSyscallException::ice_name() const
 {
     return _name;
@@ -87,7 +87,7 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
 
 const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
 
-const char*
+const string
 IceUtil::ThreadLockedException::ice_name() const
 {
     return _name;
@@ -112,7 +112,7 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
 
 const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
 
-const char*
+const string
 IceUtil::ThreadStartedException::ice_name() const
 {
     return _name;
@@ -137,7 +137,7 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
 
 const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
 
-const char*
+const string
 IceUtil::ThreadNotStartedException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 430a82ffc01..963215ae888 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -99,7 +99,7 @@ static UUIDCleanup uuidCleanup;
 
 #endif
 
-const char*
+const string
 IceUtil::UUIDGenerationException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index b7d03341138..f5d980d1e3e 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -30,7 +30,7 @@ IceXML::ParserException::ParserException(const char* file, int line, const strin
 
 const char* IceXML::ParserException::_name = "IceXML::ParserException";
 
-const char*
+const string
 IceXML::ParserException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index b0f192d379a..b333d58b2d0 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -414,12 +414,12 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	C << eb;
     }
 
-    H << nl << "virtual const char* ice_name() const;";
+    H << nl << "virtual const ::std::string ice_name() const;";
 
     string flatName = p->flattenedScope() + p->name() + "_name";
 
     C << sp << nl << "static const char* " << flatName << " = \"" << p->scoped().substr(2) << "\";";
-    C << sp << nl << "const char*" << nl << scoped.substr(2) << "::ice_name() const";
+    C << sp << nl << "const ::std::string" << nl << scoped.substr(2) << "::ice_name() const";
     C << sb;
     C << nl << "return " << flatName << ';';
     C << eb;
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 196a98f0b62..2a70f308162 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -349,12 +349,12 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
 	C << eb;
     }
 
-    H << nl << "virtual const char* ice_name() const;";
+    H << nl << "virtual const ::std::string ice_name() const;";
 
     string flatName = p->flattenedScope() + p->name() + "_name";
 
     C << sp << nl << "static const char* " << flatName << " = \"" << p->scoped().substr(2) << "\";";
-    C << sp << nl << "const char*" << nl << scoped.substr(2) << "::ice_name() const";
+    C << sp << nl << "const ::std::string" << nl << scoped.substr(2) << "::ice_name() const";
     C << sb;
     C << nl << "return " << flatName << ';';
     C << eb;