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 --- starmath/inc/smmod.hrc | 2 +- starmath/inc/strings.hrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'starmath/inc') diff --git a/starmath/inc/smmod.hrc b/starmath/inc/smmod.hrc index f946e61cc513..59a4a7cd845f 100644 --- a/starmath/inc/smmod.hrc +++ b/starmath/inc/smmod.hrc @@ -9,7 +9,7 @@ #ifndef INCLUDED_VCL_INC_STRINGS_HRC #define INCLUDED_VCL_INC_STRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) const char* RID_UI_SYMBOLSET_NAMES[] = { diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc index 8ef050ec8a56..fc6f9bae05f0 100644 --- a/starmath/inc/strings.hrc +++ b/starmath/inc/strings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_SM_INC_STRINGS_HRC #define INCLUDED_SM_INC_STRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) #define RID_PLUSX_HELP NC_("RID_PLUSX_HELP", "+ Sign" ) #define RID_MINUSX_HELP NC_("RID_MINUSX_HELP", "- Sign" ) -- cgit