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 /sc/inc/globstr.hrc | |
| 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 'sc/inc/globstr.hrc')
| -rw-r--r-- | sc/inc/globstr.hrc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 849db2c574d0..aba2cceea750 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -20,8 +20,8 @@ #ifndef SC_GLOBSTR_HRC #define SC_GLOBSTR_HRC -#define NC_(Context, String) (Context "\004" u8##String) -#define NNC_(Context, StringSingular, StringPlural) (Context "\004" u8##StringSingular "\004" u8##StringPlural) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +#define NNC_(Context, StringSingular, StringPlural) reinterpret_cast<char const *>(Context "\004" u8##StringSingular "\004" u8##StringPlural) /* * This file is reserved for string IDs of permanently loaded resident string |