diff options
| author | Jose <jose@zeroc.com> | 2014-10-30 16:03:47 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-30 16:03:47 +0100 |
| commit | da8c267316512436ba19f28fa42510be305093f6 (patch) | |
| tree | 935f3eefd77e909c847a44883fef38fce4bda48d /cpp/src/IceUtil/ConvertUTF.h | |
| parent | Merge branch 'master' of ssh://git/home/git/ice (diff) | |
| download | ice-da8c267316512436ba19f28fa42510be305093f6.tar.bz2 ice-da8c267316512436ba19f28fa42510be305093f6.tar.xz ice-da8c267316512436ba19f28fa42510be305093f6.zip | |
ICE-5804 - Warnings when building with GCC (Eliminate C style casts)
Diffstat (limited to 'cpp/src/IceUtil/ConvertUTF.h')
| -rw-r--r-- | cpp/src/IceUtil/ConvertUTF.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index 17a638f320c..81414351ebf 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -111,11 +111,11 @@ typedef unsigned char UTF8; /* typically 8 bits */ typedef bool Boolean; /* 0 or 1 */ /* Some fundamental constants */ -#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD -#define UNI_MAX_BMP (UTF32)0x0000FFFF -#define UNI_MAX_UTF16 (UTF32)0x0010FFFF -#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF -#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF +#define UNI_REPLACEMENT_CHAR static_cast<UTF32>(0x0000FFFD) +#define UNI_MAX_BMP static_cast<UTF32>(0x0000FFFF) +#define UNI_MAX_UTF16 static_cast<UTF32>(0x0010FFFF) +#define UNI_MAX_UTF32 static_cast<UTF32>(0x7FFFFFFF) +#define UNI_MAX_LEGAL_UTF32 static_cast<UTF32>(0x0010FFFF) ConversionResult ConvertUTF8toUTF16( |