diff options
| author | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
| commit | 13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch) | |
| tree | c230ae28caba40ac1f939fbedb5fd780d49fad0c /cpp/src/IceUtil/Options.cpp | |
| parent | ICE-6861 - removing public stream API (diff) | |
| download | ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2 ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip | |
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'cpp/src/IceUtil/Options.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Options.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp index a2201deed1f..309a5303a64 100644 --- a/cpp/src/IceUtil/Options.cpp +++ b/cpp/src/IceUtil/Options.cpp @@ -20,16 +20,14 @@ IceUtilInternal::APIException::APIException(const char* file, int line, const st { } -IceUtilInternal::APIException::~APIException() throw() +IceUtilInternal::APIException::~APIException() ICE_NOEXCEPT { } -const char* IceUtilInternal::APIException::_name = "IceUtilInternal::APIException"; - string -IceUtilInternal::APIException::ice_name() const +IceUtilInternal::APIException::ice_id() const { - return _name; + return "::IceUtilInternal::APIException"; } void @@ -42,11 +40,13 @@ IceUtilInternal::APIException::ice_print(ostream& out) const } } +#ifndef ICE_CPP11_MAPPING IceUtilInternal::APIException* IceUtilInternal::APIException::ice_clone() const { return new APIException(*this); } +#endif void IceUtilInternal::APIException::ice_throw() const @@ -66,16 +66,14 @@ IceUtilInternal::BadOptException::BadOptException(const char* file, int line, co { } -IceUtilInternal::BadOptException::~BadOptException() throw() +IceUtilInternal::BadOptException::~BadOptException() ICE_NOEXCEPT { } -const char* IceUtilInternal::BadOptException::_name = "IceUtilInternal::BadOptException"; - string -IceUtilInternal::BadOptException::ice_name() const +IceUtilInternal::BadOptException::ice_id() const { - return _name; + return "::IceUtilInternal::BadOptException"; } void @@ -88,11 +86,13 @@ IceUtilInternal::BadOptException::ice_print(ostream& out) const } } +#ifndef ICE_CPP11_MAPPING IceUtilInternal::BadOptException* IceUtilInternal::BadOptException::ice_clone() const { return new BadOptException(*this); } +#endif void IceUtilInternal::BadOptException::ice_throw() const |