diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 15:46:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 17:17:26 +0100 |
| commit | c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce (patch) | |
| tree | 4583d522e843ee4e52e107cbaeace2aed09019b3 /external | |
| parent | 1ee42f427fc80a4f3a63ee9fffbf9d187f1253ba (diff) | |
Adapt to C++2a char_t
u8 literals incompatibly change their type (as implemented by recent Clang
trunk)
Change-Id: Ia4f7b91f5d86656a056303d2754981ab2093a739
Reviewed-on: https://gerrit.libreoffice.org/63494
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/char8_t.patch | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 83a2968eb3fd..b241e8db7c13 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -37,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/icu4c-61-werror-shadow.patch.1 \ external/icu/gcc9.patch \ + external/icu/char8_t.patch \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) diff --git a/external/icu/char8_t.patch b/external/icu/char8_t.patch new file mode 100644 index 000000000000..d13b29634bc5 --- /dev/null +++ b/external/icu/char8_t.patch @@ -0,0 +1,19 @@ +--- source/common/ucasemap.cpp ++++ source/common/ucasemap.cpp +@@ -687,13 +687,13 @@ + if (change) { + ByteSinkUtil::appendTwoBytes(upper, sink); + if ((data & HAS_EITHER_DIALYTIKA) != 0) { +- sink.Append(u8"\u0308", 2); // restore or add a dialytika ++ sink.Append(reinterpret_cast<char const *>(u8"\u0308"), 2); // restore or add a dialytika + } + if (addTonos) { +- sink.Append(u8"\u0301", 2); ++ sink.Append(reinterpret_cast<char const *>(u8"\u0301"), 2); + } + while (numYpogegrammeni > 0) { +- sink.Append(u8"\u0399", 2); ++ sink.Append(reinterpret_cast<char const *>(u8"\u0399"), 2); + --numYpogegrammeni; + } + } |