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 /uui | |
| 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 'uui')
| -rw-r--r-- | uui/inc/ids.hrc | 2 | ||||
| -rw-r--r-- | uui/inc/strings.hrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc index 84d409f083ef..061c2a77bd80 100644 --- a/uui/inc/ids.hrc +++ b/uui/inc/ids.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_UUI_INC_IDS_HRC #define INCLUDED_UUI_INC_IDS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) const std::pair<const char*, ErrCode> RID_UUI_ERRHDL[] = { diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc index 22deb50f2837..7c327b579738 100644 --- a/uui/inc/strings.hrc +++ b/uui/inc/strings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_UUI_INC_STRINGS_HRC #define INCLUDED_UUI_INC_STRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #define STR_ENTER_PASSWORD_TO_OPEN NC_("STR_ENTER_PASSWORD_TO_OPEN", "Enter password to open file: \n") #define STR_ENTER_PASSWORD_TO_MODIFY NC_("STR_ENTER_PASSWORD_TO_MODIFY", "Enter password to modify file: \n") |