4 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index 9fb0c895b31..2b76a9aae7c 100644
--- a/cpp/src/FreezeScript/Exception.cpp
+++ b/cpp/src/FreezeScript/Exception.cpp
@@ -19,9 +19,9 @@ FreezeScript::FailureException::FailureException(const char* file, int line, con
 {
 }
 
-string FreezeScript::FailureException::_name = "FreezeScript::FailureException";
+const char* FreezeScript::FailureException::_name = "FreezeScript::FailureException";
 
-const string&
+const char*
 FreezeScript::FailureException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
index 5158be8a27c..1c79f90c950 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 std::string& ice_name() const;
+    virtual const char* ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
     virtual void ice_throw() const;
@@ -30,7 +30,7 @@ public:
 private:
 
     std::string _reason;
-    static std::string _name;
+    static const char* _name;
 };
 
 } // End of namespace FreezeScript
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index 7b94ffbca69..f567f27d66a 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -126,9 +126,9 @@ FreezeScript::EvaluateException::EvaluateException(const char* file, int line, c
 {
 }
 
-string FreezeScript::EvaluateException::_name = "FreezeScript::EvaluateException";
+const char* FreezeScript::EvaluateException::_name = "FreezeScript::EvaluateException";
 
-const string&
+const char*
 FreezeScript::EvaluateException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
index 8865f57da1e..4c4af3bf9a9 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 std::string& ice_name() const;
+    virtual const char* ice_name() const;
     virtual void ice_print(std::ostream&) const;
     virtual IceUtil::Exception* ice_clone() const;
     virtual void ice_throw() const;
@@ -49,7 +49,7 @@ public:
 private:
 
     std::string _reason;
-    static std::string _name;
+    static const char* _name;
 };
 
 //