diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-06-03 14:11:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-06-03 14:11:48 -0400 |
| commit | 48b141f8f6a8603f6b13a85bde002f6b480832f7 (patch) | |
| tree | 41cf4ae281ad96e13216ea208a6579aa442844d3 /cpp/src/IceUtil/ConvertUTF.cpp | |
| parent | Fixed 3.7a2 version in msbuild props files (diff) | |
| download | ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.tar.bz2 ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.tar.xz ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.zip | |
Refactored string converters and use codecvt_utf8[_utf16] when
available instead of ConvertUTF
Diffstat (limited to 'cpp/src/IceUtil/ConvertUTF.cpp')
| -rw-r--r-- | cpp/src/IceUtil/ConvertUTF.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/IceUtil/ConvertUTF.cpp b/cpp/src/IceUtil/ConvertUTF.cpp index 2a28c78e5e1..5e0b110542c 100644 --- a/cpp/src/IceUtil/ConvertUTF.cpp +++ b/cpp/src/IceUtil/ConvertUTF.cpp @@ -47,9 +47,15 @@ ------------------------------------------------------------------------ */ +#include <IceUtil/Config.h> + +#ifndef ICE_HAS_CODECVT_UTF8 +// +// It's better to exclude the file from the build, but it's not always +// easy to do. +// #include <IceUtil/ConvertUTF.h> -#include <IceUtil/StringConverter.h> #ifdef CVTUTF_DEBUG #include <stdio.h> @@ -439,12 +445,7 @@ ConversionResult ConvertUTF8toUTF32 ( similarly unrolled loops. --------------------------------------------------------------------- */ -} -namespace IceUtil -{ - -using namespace IceUtilInternal; /* --------------------------------------------------------------------- */ @@ -473,5 +474,6 @@ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) { } } } - } + +#endif |