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 /extensions/inc | |
| 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 'extensions/inc')
| -rw-r--r-- | extensions/inc/command.hrc | 2 | ||||
| -rw-r--r-- | extensions/inc/showhide.hrc | 2 | ||||
| -rw-r--r-- | extensions/inc/stringarrays.hrc | 2 | ||||
| -rw-r--r-- | extensions/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | extensions/inc/yesno.hrc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/extensions/inc/command.hrc b/extensions/inc/command.hrc index be373257e202..8ae09743b154 100644 --- a/extensions/inc/command.hrc +++ b/extensions/inc/command.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_INC_COMMAND_HRC #define INCLUDED_EXTENSIONS_INC_COMMAND_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) namespace { diff --git a/extensions/inc/showhide.hrc b/extensions/inc/showhide.hrc index 6081f7d5c39a..0f7ec42ad346 100644 --- a/extensions/inc/showhide.hrc +++ b/extensions/inc/showhide.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC #define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) namespace { diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc index 4f05d7475df1..c7053e143bf0 100644 --- a/extensions/inc/stringarrays.hrc +++ b/extensions/inc/stringarrays.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC #define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) const char* RID_RSC_ENUM_VERTICAL_ALIGN[] = { diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc index 436c273ffd40..d4a1318605ca 100644 --- a/extensions/inc/strings.hrc +++ b/extensions/inc/strings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_INC_STRINGS_HRC #define INCLUDED_EXTENSIONS_INC_STRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #define RID_STR_EDITMASK NC_("RID_STR_EDITMASK", "Edit mask") #define RID_STR_LITERALMASK NC_("RID_STR_LITERALMASK", "Literal mask") diff --git a/extensions/inc/yesno.hrc b/extensions/inc/yesno.hrc index 8c6df7b537ae..3992a1e8ab28 100644 --- a/extensions/inc/yesno.hrc +++ b/extensions/inc/yesno.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_EXTENSIONS_INC_YESNO_HRC #define INCLUDED_EXTENSIONS_INC_YESNO_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) namespace { |