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

2 files changed, 3 insertions, 10 deletions

diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index c10b6061557..180545bea67 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -20,12 +20,12 @@ using namespace IceXML;
 // ParserException
 //
 IceXML::ParserException::ParserException(const string& reason) :
-    IceUtil::Exception(), _reason(reason)
+    _reason(reason)
 {
 }
 
 IceXML::ParserException::ParserException(const char* file, int line, const string& reason) :
-    IceUtil::Exception(file, line), _reason(reason)
+    IceUtil::ExceptionHelper<ParserException>(file, line), _reason(reason)
 {
 }
 
@@ -63,12 +63,6 @@ IceXML::ParserException::ice_clone() const
 }
 #endif
 
-void
-IceXML::ParserException::ice_throw() const
-{
-    throw *this;
-}
-
 string
 IceXML::ParserException::reason() const
 {
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h
index b44b3cac897..d6c7c43331d 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/src/IceXML/Parser.h
@@ -42,7 +42,7 @@
 namespace IceXML
 {
 
-class ICE_XML_API ParserException : public IceUtil::Exception
+class ICE_XML_API ParserException : public IceUtil::ExceptionHelper<ParserException>
 {
 public:
 
@@ -57,7 +57,6 @@ public:
 #ifndef ICE_CPP11_MAPPING
     virtual ParserException* ice_clone() const;
 #endif
-    virtual void ice_throw() const;
 
     std::string reason() const;