diff options
Diffstat (limited to 'cpp/include/Ice/IconvStringConverter.h')
| -rw-r--r-- | cpp/include/Ice/IconvStringConverter.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h index e8b401dff68..185a2bb4b8e 100644 --- a/cpp/include/Ice/IconvStringConverter.h +++ b/cpp/include/Ice/IconvStringConverter.h @@ -27,10 +27,10 @@ #endif // -// On Windows, you must be very careful with mixing errno and mixing C runtime libraries -// If you're using different C runtime libraries for your main program and the libiconv DLL, -// you're using different errno ... a not-so-good work-around is to ignore errno altogether, -// by defining ICE_NO_ERRNO +// On Windows, we need to be very careful with errno: if we use different C +// runtime libraries for the main program and the libiconv DLL, we end up with +// two different errnos ... a not-so-good work-around is to ignore errno +// altogether, by defining ICE_NO_ERRNO // namespace Ice @@ -81,15 +81,12 @@ private: // #ifdef __SUNPRO_CC - extern "C" { typedef void (*IcePthreadKeyDestructor)(void*); } #endif - - template<typename charT> IconvStringConverter<charT>::IconvStringConverter(const char* internalCode) : _internalCode(internalCode) @@ -178,8 +175,7 @@ IconvStringConverter<charT>::createDescriptors() const throw Ice::StringConversionException( __FILE__, __LINE__, - std::string("iconv cannot convert from ") + _internalCode + " to " + externalCode); - + std::string("iconv cannot convert from ") + _internalCode + " to " + externalCode); } return cdp; } |