summaryrefslogtreecommitdiff
path: root/dbaccess
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 /dbaccess
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 'dbaccess')
-rw-r--r--dbaccess/inc/query.hrc2
-rw-r--r--dbaccess/inc/strings.hrc2
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/inc/query.hrc b/dbaccess/inc/query.hrc
index 00a17a34aeef..fe4042517603 100644
--- a/dbaccess/inc/query.hrc
+++ b/dbaccess/inc/query.hrc
@@ -19,7 +19,7 @@
#ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
#define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
const char* RSC_QUERY_OBJECT_TYPE[] =
{
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 1cadb41966f9..840e0b87e5e1 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -20,7 +20,7 @@
#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
#define RID_STR_CONNECTION_INVALID NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.")
#define RID_STR_TABLE_IS_FILTERED NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.")