summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-17 15:46:38 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-11-17 17:17:26 +0100
commitc89a4996b82881988eb9cc1eeaf24e0d8f9e6dce (patch)
tree4583d522e843ee4e52e107cbaeace2aed09019b3 /starmath/inc
parent1ee42f427fc80a4f3a63ee9fffbf9d187f1253ba (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 'starmath/inc')
-rw-r--r--starmath/inc/smmod.hrc2
-rw-r--r--starmath/inc/strings.hrc2
2 files changed, 2 insertions, 2 deletions
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<char const *>(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<char const *>(Context "\004" u8##String)
#define RID_PLUSX_HELP NC_("RID_PLUSX_HELP", "+ Sign" )
#define RID_MINUSX_HELP NC_("RID_MINUSX_HELP", "- Sign" )