summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/IconvStringConverter.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-07-18 12:12:43 -0400
committerBernard Normier <bernard@zeroc.com>2007-07-18 12:12:43 -0400
commita080257a8680ee33095a34358fb578c29d96cb0c (patch)
treef92b221d4e374a9f22cbb7700bce0fbf9e2d4232 /cpp/include/Ice/IconvStringConverter.h
parentMore locale (diff)
downloadice-a080257a8680ee33095a34358fb578c29d96cb0c.tar.bz2
ice-a080257a8680ee33095a34358fb578c29d96cb0c.tar.xz
ice-a080257a8680ee33095a34358fb578c29d96cb0c.zip
beautification
Diffstat (limited to 'cpp/include/Ice/IconvStringConverter.h')
-rw-r--r--cpp/include/Ice/IconvStringConverter.h14
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;
}