Bug 1339.

Bug 1335 and 1325 for Ice-E.

6 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index c779b6c2b0f..b48e7d4a1b2 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -138,7 +138,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::Options::BadOpt& e)
+    catch(const IceUtil::BadOptException& e)
     {
 	cerr << argv[0] << ": " << e.reason << endl;
 	usage(argv[0]);
diff --git a/cpp/src/FreezeScript/Exception.cpp b/cpp/src/FreezeScript/Exception.cpp
index 669f21d3a36..f3e00cd566b 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 string
+string
 FreezeScript::FailureException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h
index a7e9fd17802..950dd40700c 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 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 7325f982995..94b15d6269e 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 string
+string
 FreezeScript::EvaluateException::ice_name() const
 {
     return _name;
diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h
index d8fca3d75ec..33a24a845d6 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 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/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 0464449f096..0497dc30d8a 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -237,7 +237,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::Options::BadOpt& e)
+    catch(const IceUtil::BadOptException& e)
     {
 	cerr << argv[0] << ": " << e.reason << endl;
 	usage(argv[0]);