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 --- formula/inc/core_resource.hrc | 2 +- formula/inc/strings.hrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'formula') diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc index 4cc928fd9a6a..9d97fd771d9e 100644 --- a/formula/inc/core_resource.hrc +++ b/formula/inc/core_resource.hrc @@ -23,7 +23,7 @@ #include #include -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) /** These English names are used to store/load ODFF as of ODF v1.2. */ // NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY diff --git a/formula/inc/strings.hrc b/formula/inc/strings.hrc index 1d654c08e7da..154daca73ea1 100644 --- a/formula/inc/strings.hrc +++ b/formula/inc/strings.hrc @@ -20,7 +20,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) #define STR_OPTIONAL NC_("STR_OPTIONAL", "(optional)") #define STR_REQUIRED NC_("STR_REQUIRED", "(required)") -- cgit