diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
| commit | 752e06b4eb63abb8a30bb958802eaedda72d3806 (patch) | |
| tree | 7c2348544d202c310a55a62629abc4025daa03a5 /cpp/src/IceUtil/Options.cpp | |
| parent | Disable VS 2015 update 3 optimizer (diff) | |
| download | ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2 ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip | |
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
Diffstat (limited to 'cpp/src/IceUtil/Options.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Options.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp index 55615665a11..88626de2d9a 100644 --- a/cpp/src/IceUtil/Options.cpp +++ b/cpp/src/IceUtil/Options.cpp @@ -16,7 +16,7 @@ using namespace std; using namespace IceUtil; IceUtilInternal::APIException::APIException(const char* file, int line, const string& r) - : IceUtil::Exception(file, line), reason(r) + : IceUtil::ExceptionHelper<APIException>(file, line), reason(r) { } @@ -50,12 +50,6 @@ IceUtilInternal::APIException::ice_clone() const } #endif -void -IceUtilInternal::APIException::ice_throw() const -{ - throw *this; -} - ostream& IceUtilInternal::operator<<(ostream& out, const IceUtilInternal::APIException& ex) { @@ -64,7 +58,7 @@ IceUtilInternal::operator<<(ostream& out, const IceUtilInternal::APIException& e } IceUtilInternal::BadOptException::BadOptException(const char* file, int line, const string& r) - : IceUtil::Exception(file, line), reason(r) + : IceUtil::ExceptionHelper<BadOptException>(file, line), reason(r) { } @@ -98,12 +92,6 @@ IceUtilInternal::BadOptException::ice_clone() const } #endif -void -IceUtilInternal::BadOptException::ice_throw() const -{ - throw *this; -} - ostream& IceUtilInternal::operator<<(ostream& out, const IceUtilInternal::BadOptException& ex) { |