Bug 1339.

Bug 1335 and 1325 for Ice-E.

3 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp
index 18ea8a003ec..21309d22beb 100644
--- a/cpp/src/IceBox/Admin.cpp
+++ b/cpp/src/IceBox/Admin.cpp
@@ -58,7 +58,7 @@ Client::run(int argc, char* argv[])
     {
     	commands = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::Options::BadOpt& e)
+    catch(const IceUtil::BadOptException& e)
     {
         cerr << e.reason << endl;
 	usage();
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 4b7cfedef20..723316a18b0 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -54,7 +54,7 @@ IceBox::IceBoxService::start(int argc, char* argv[])
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::Options::BadOpt& e)
+    catch(const IceUtil::BadOptException& e)
     {
         error(e.reason);
         usage(argv[0]);
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 721aacdf695..c6d8023f04b 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -193,7 +193,7 @@ IceBox::ServiceManagerI::load(const string& name, const string& value)
 	{
 	    args = IceUtil::Options::split(value.substr(pos + 1));
 	}
-	catch(const IceUtil::Options::BadQuote& ex)
+	catch(const IceUtil::BadOptException& ex)
 	{
 	    FailureException e(__FILE__, __LINE__);
 	    e.reason = "ServiceManager: invalid arguments for service `" + name + "':\n" + ex.reason;