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 --- forms/inc/strings.hrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'forms/inc') diff --git a/forms/inc/strings.hrc b/forms/inc/strings.hrc index 50a5a19504f1..56f8f3d3217b 100644 --- a/forms/inc/strings.hrc +++ b/forms/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 RID_BASELISTBOX_ERROR_FILLLIST NC_("RID_BASELISTBOX_ERROR_FILLLIST", "The contents of a combo box or list field could not be determined.") #define RID_STR_IMPORT_GRAPHIC NC_("RID_STR_IMPORT_GRAPHIC", "Insert Image" ) -- cgit