diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/src/IceUtil/UtilException.cpp | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/src/IceUtil/UtilException.cpp')
| -rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 50b5b7ce0f6..46873339daa 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -473,7 +473,7 @@ getStackTrace(const vector<void*>& stackFrames) if(ok) { #ifdef DBGHELP_TRANSLATE_TCHAR - s << IceUtil::wstringToString(symbol->Name, converter); + s << wstringToString(symbol->Name, converter); #else s << symbol->Name; #endif @@ -482,7 +482,7 @@ getStackTrace(const vector<void*>& stackFrames) { s << " at " #ifdef DBGHELP_TRANSLATE_TCHAR - << IceUtil::wstringToString(line.FileName, converter) + << wstringToString(line.FileName, converter) #else << line.FileName #endif @@ -885,44 +885,3 @@ IceUtil::OptionalNotSetException::ice_clone() const return new OptionalNotSetException(*this); } #endif - -#ifndef _WIN32 -IceUtil::IconvInitializationException::IconvInitializationException(const char* file, int line, const string& reason) : - ExceptionHelper<IconvInitializationException>(file, line), - _reason(reason) -{ -} - -#ifndef ICE_CPP11_COMPILER -IceUtil::IconvInitializationException::~IconvInitializationException() throw() -{ -} -#endif - -void -IceUtil::IconvInitializationException::ice_print(ostream& out) const -{ - Exception::ice_print(out); - out << ": " << _reason; -} - -string -IceUtil::IconvInitializationException::ice_id() const -{ - return "::IceUtil::IconvInitializationException"; -} - -#ifndef ICE_CPP11_MAPPING -IceUtil::IconvInitializationException* -IceUtil::IconvInitializationException::ice_clone() const -{ - return new IconvInitializationException(*this); -} -#endif - -string -IceUtil::IconvInitializationException::reason() const -{ - return _reason; -} -#endif |