Date: Thursday, January 11, 2007 @ 10:37:17
Author: marc
Path: /cvsroot/carob/carob
Modified: include/StringCodecs.hpp (1.19 -> 1.20) src/StringCodecs.cpp
(1.14 -> 1.15)
Moved CONVERTER_BUFFER_SIZE constant from .hpp to .cpp.
Avoids multiple definitions and increases ICONV / not ICONV compatibility
CAROB-79
--------------------------+
include/StringCodecs.hpp | 1 -
src/StringCodecs.cpp | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: carob/include/StringCodecs.hpp
diff -u carob/include/StringCodecs.hpp:1.19 carob/include/StringCodecs.hpp:1.20
--- carob/include/StringCodecs.hpp:1.19 Fri Dec 22 11:21:07 2006
+++ carob/include/StringCodecs.hpp Thu Jan 11 10:37:17 2007
@@ -120,7 +120,6 @@
/**
* Multi-Byte String encoder and decoders based on iconv
*/
-const int CONVERTER_BUFFER_SIZE = 1024;
class IconvCodec
{
Index: carob/src/StringCodecs.cpp
diff -u carob/src/StringCodecs.cpp:1.14 carob/src/StringCodecs.cpp:1.15
--- carob/src/StringCodecs.cpp:1.14 Wed Jan 10 19:13:10 2007
+++ carob/src/StringCodecs.cpp Thu Jan 11 10:37:17 2007
@@ -31,6 +31,9 @@
namespace {
#ifdef CAROB_USE_ICONV
+
+const int CONVERTER_BUFFER_SIZE = 1024;
+
/**
* MAYBECONST is either "const char**" or "char**" (iconv prototype
* has unfortunately changed overtime)
@@ -52,7 +55,7 @@
return (*iconv_function) (handle, const_cast<MAYBECONST>(inbuf),
inavail, outbuf, outavail);
}
-#endif
+#endif // CAROB_USE_ICONV
// Warning: this function needs the codec of fromString() to have been
// properly initialized.
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
