diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-09-24 12:16:36 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-09-29 16:45:08 +0200 |
| commit | 5a40abc86b94c0be5b4a252c6ab5b0b0df6e520d (patch) | |
| tree | f8aeac628b0b3629faa21c4787885a0166520d39 /vcl/unx | |
| parent | ef5cb6cdcd50942aea56ffb322bc89a4c7069bc6 (diff) | |
Drop some newly obsolete __cplusplus version checks
...after 1eef07805021b7ca26a1a8894809b6d995747ba1 "Bump baseline to C++20".
Which revealed that at least for VS 2019 16.11.30 (but not for at least VS 2022
17.7.4), in /clr mode (e.g., when compiling
cli_ure/source/climaker/climaker_app.cxx), the -std:c++20 is effectively
ignored, and compilation of such source files failed with
> include\rtl/string.hxx(191): error C2955: 'rtl::OStringLiteral': use of class template requires template argument list
> include\rtl/string.hxx(88): note: see declaration of 'rtl::OStringLiteral'
> include\rtl/string.hxx(191): error C7592: a non-type template-parameter of type 'rtl::OStringLiteral' requires at least '/std:c++20'
> include\rtl/string.hxx(397): error C2955: 'rtl::OStringLiteral': use of class template requires template argument list
> include\rtl/string.hxx(88): note: see declaration of 'rtl::OStringLiteral'
etc. To work around that, keep the 27d1f3ac016d77d3c907cebedca558308f366855
"O[U]String literals (unusable for now, C++20 only)" functionality disabled when
compiling /clr sources (i.e., where _MANAGED is defined) for that old compiler.
Change-Id: If62ceef5f8e55a828b880f197111fe387e4953fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157205
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/customcellrenderer.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/unx/gtk3/customcellrenderer.cxx b/vcl/unx/gtk3/customcellrenderer.cxx index 7632c7641538..a6559f99ce99 100644 --- a/vcl/unx/gtk3/customcellrenderer.cxx +++ b/vcl/unx/gtk3/customcellrenderer.cxx @@ -26,14 +26,12 @@ enum }; } -#if defined __clang__ && __cplusplus >= 202002L && GLIB_MAJOR_VERSION == 2 \ - && GLIB_MINOR_VERSION < 68 +#if defined __clang__ && GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 68 #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-volatile" #endif G_DEFINE_TYPE(CustomCellRenderer, custom_cell_renderer, GTK_TYPE_CELL_RENDERER_TEXT) -#if defined __clang__ && __cplusplus >= 202002L && GLIB_MAJOR_VERSION == 2 \ - && GLIB_MINOR_VERSION < 68 +#if defined __clang__ && GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 68 #pragma clang diagnostic pop #endif |