From c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 17 Nov 2018 15:46:38 +0100 Subject: 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 --- reportdesign/inc/stringarray.hrc | 2 +- reportdesign/inc/strings.hrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/inc/stringarray.hrc b/reportdesign/inc/stringarray.hrc index 6c91b21102b4..b49f401d0f54 100644 --- a/reportdesign/inc/stringarray.hrc +++ b/reportdesign/inc/stringarray.hrc @@ -10,7 +10,7 @@ #ifndef INCLUDED_REPORTDESIGN_INC_FNP_HRC #define INCLUDED_REPORTDESIGN_INC_FNP_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) const char* RID_STR_FORCENEWPAGE_CONST[] = { diff --git a/reportdesign/inc/strings.hrc b/reportdesign/inc/strings.hrc index 1766d3f6b209..bcabc42faa08 100644 --- a/reportdesign/inc/strings.hrc +++ b/reportdesign/inc/strings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC #define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) #define RID_STR_PROPPAGE_DEFAULT NC_("RID_STR_PROPPAGE_DEFAULT", "General") #define RID_STR_PROPPAGE_DATA NC_("RID_STR_PROPPAGE_DATA", "Data") -- cgit v1.2.3