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, 1 insertions, 8 deletions

diff --git a/cpp/src/IceBT/TransceiverI.cpp b/cpp/src/IceBT/TransceiverI.cpp
index 4a3f4005803..327c96d9ef3 100644
--- a/cpp/src/IceBT/TransceiverI.cpp
+++ b/cpp/src/IceBT/TransceiverI.cpp
@@ -35,11 +35,7 @@ IceBT::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::Bu
 }
 
 IceInternal::SocketOperation
-#ifdef ICE_CPP11_MAPPING
-IceBT::TransceiverI::closing(bool initiator, exception_ptr)
-#else
 IceBT::TransceiverI::closing(bool initiator, const Ice::LocalException&)
-#endif
 {
     //
     // If we are initiating the connection closure, wait for the peer
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index dee886dffb3..04170a52327 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -28,11 +28,8 @@ public:
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
     virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&);
-#ifdef ICE_CPP11_MAPPING
-    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
-#else
+
     virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
-#endif
     virtual void close();
     virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
     virtual IceInternal::SocketOperation read(IceInternal::Buffer&);