diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-09 18:44:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 18:44:09 +0100 |
| commit | b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f (patch) | |
| tree | f78fc5b7b2ea337ffc306a77223018fcc780e507 /ACE/ace/UTF16_Encoding_Converter.cpp | |
| parent | 199259c5d2d5f4a6550382a683f5d54ac482fcd1 (diff) | |
| parent | adc1dcda981a4c76612bedeba2dddb76aa272d6f (diff) | |
| download | ATCD-b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f.tar.gz | |
Merge pull request #1446 from jwillemsen/jwi-cpp11cleanup
Various cleanup and use of C++11 features
Diffstat (limited to 'ACE/ace/UTF16_Encoding_Converter.cpp')
| -rw-r--r-- | ACE/ace/UTF16_Encoding_Converter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ACE/ace/UTF16_Encoding_Converter.cpp b/ACE/ace/UTF16_Encoding_Converter.cpp index 941ab11b24e..b1455d3b5f9 100644 --- a/ACE/ace/UTF16_Encoding_Converter.cpp +++ b/ACE/ace/UTF16_Encoding_Converter.cpp @@ -30,17 +30,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -static const ACE_UINT32 halfShift = 10; -static const ACE_UINT32 halfBase = 0x00010000; -static const ACE_UINT32 halfMask = 0x000003FF; - -static const ACE_UINT32 UNI_SUR_HIGH_START = 0x0000D800; -static const ACE_UINT32 UNI_SUR_HIGH_END = 0x0000DBFF; -static const ACE_UINT32 UNI_SUR_LOW_START = 0x0000DC00; -static const ACE_UINT32 UNI_SUR_LOW_END = 0x0000DFFF; -static const ACE_UINT32 UNI_REPLACEMENT_CHAR = 0x0000FFFD; -static const ACE_UINT32 UNI_MAX_BMP = 0x0000FFFF; -static const ACE_UINT32 UNI_MAX_UTF16 = 0x0010FFFF; +static constexpr ACE_UINT32 halfShift = 10; +static constexpr ACE_UINT32 halfBase = 0x00010000; +static constexpr ACE_UINT32 halfMask = 0x000003FF; + +static constexpr ACE_UINT32 UNI_SUR_HIGH_START = 0x0000D800; +static constexpr ACE_UINT32 UNI_SUR_HIGH_END = 0x0000DBFF; +static constexpr ACE_UINT32 UNI_SUR_LOW_START = 0x0000DC00; +static constexpr ACE_UINT32 UNI_SUR_LOW_END = 0x0000DFFF; +static constexpr ACE_UINT32 UNI_REPLACEMENT_CHAR = 0x0000FFFD; +static constexpr ACE_UINT32 UNI_MAX_BMP = 0x0000FFFF; +static constexpr ACE_UINT32 UNI_MAX_UTF16 = 0x0010FFFF; // Once the bits are split out into bytes of UTF-8, this is a mask OR-ed // into the first byte, depending on how many bytes follow. There are |