diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 15:46:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 17:17:26 +0100 |
| commit | c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce (patch) | |
| tree | 4583d522e843ee4e52e107cbaeace2aed09019b3 /vcl | |
| parent | 1ee42f427fc80a4f3a63ee9fffbf9d187f1253ba (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 'vcl')
| -rw-r--r-- | vcl/inc/font/OpenTypeFeatureStrings.hrc | 2 | ||||
| -rw-r--r-- | vcl/inc/print.hrc | 2 | ||||
| -rw-r--r-- | vcl/inc/printaccessoryview.hrc | 2 | ||||
| -rw-r--r-- | vcl/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | vcl/inc/units.hrc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/font/OpenTypeFeatureStrings.hrc b/vcl/inc/font/OpenTypeFeatureStrings.hrc index d5813ed31c2f..88a90f2c7d5a 100644 --- a/vcl/inc/font/OpenTypeFeatureStrings.hrc +++ b/vcl/inc/font/OpenTypeFeatureStrings.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC #define INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #define STR_FONT_FEATURE_ID_AALT NC_("STR_FONT_FEATURE_ID_AALT", "Access All Alternates") #define STR_FONT_FEATURE_ID_AFRC NC_("STR_FONT_FEATURE_ID_AFRC", "Alternative (Vertical) Fractions") diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc index b1b3d47c7be3..505f508b45b8 100644 --- a/vcl/inc/print.hrc +++ b/vcl/inc/print.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_PRINT_HRC #define INCLUDED_VCL_INC_PRINT_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) const char* RID_STR_PAPERNAMES[] = { diff --git a/vcl/inc/printaccessoryview.hrc b/vcl/inc/printaccessoryview.hrc index e47ac03eb5cc..936c5b2bcce4 100644 --- a/vcl/inc/printaccessoryview.hrc +++ b/vcl/inc/printaccessoryview.hrc @@ -20,7 +20,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* SV_PRINT_NATIVE_STRINGS[] = { diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc index 1475e2a65ceb..dfaa89fda9e5 100644 --- a/vcl/inc/strings.hrc +++ b/vcl/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<char const *>(Context "\004" u8##String) #define SV_RESID_STRING_NOSELECTIONPOSSIBLE NC_("SV_RESID_STRING_NOSELECTIONPOSSIBLE", "<No selection possible>") diff --git a/vcl/inc/units.hrc b/vcl/inc/units.hrc index 031ffab67ec3..2fd522723e66 100644 --- a/vcl/inc/units.hrc +++ b/vcl/inc/units.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_UNITS_HRC #define INCLUDED_VCL_INC_UNITS_HRC -#define NC_(Context, String) (Context "\004" u8##String) +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) std::pair<const char*, FieldUnit> SV_FUNIT_STRINGS[] = { |