Added ICE_BUILDING_SRC to make builds

Ice::Dispatcher and Ice::LocalObject are now hidden with C++11
Reworked C++11 exception ice_clone, added ExceptionHelper
+ other C++ cleanups

1 files changed, 3 insertions, 4 deletions

diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h
index 63301165295..ffae862f88b 100644
--- a/cpp/include/IceUtil/Options.h
+++ b/cpp/include/IceUtil/Options.h
@@ -22,7 +22,7 @@
 namespace IceUtilInternal
 {
 
-class ICE_API APIException : public IceUtil::Exception
+class ICE_API APIException : public IceUtil::ExceptionHelper<APIException>
 {
 public:
 
@@ -35,14 +35,13 @@ public:
 #ifndef ICE_CPP11_MAPPING
     virtual APIException* ice_clone() const;
 #endif
-    virtual void ice_throw() const;
 
     ::std::string reason;
 };
 
 ICE_API ::std::ostream& operator<<(::std::ostream&, const APIException&);
 
-class ICE_API BadOptException : public IceUtil::Exception
+class ICE_API BadOptException : public IceUtil::ExceptionHelper<BadOptException>
 {
 public:
 
@@ -52,10 +51,10 @@ public:
 #endif
     virtual ::std::string ice_id() const;
     virtual void ice_print(std::ostream&) const;
+
 #ifndef ICE_CPP11_MAPPING
     virtual BadOptException* ice_clone() const;
 #endif
-    virtual void ice_throw() const;
 
     ::std::string reason;
 };