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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/qa/unit/ucalc_formula2.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sc/qa/unit/ucalc_formula2.cxx b/sc/qa/unit/ucalc_formula2.cxx index 3b068348685a..eb0a38b38c47 100644 --- a/sc/qa/unit/ucalc_formula2.cxx +++ b/sc/qa/unit/ucalc_formula2.cxx @@ -3632,15 +3632,7 @@ CPPUNIT_TEST_FIXTURE(TestFormula2, testTdf97369) auto lExpectedinE = [=](SCROW) { return SHIFT1 + SHIFT2; }; columnTest(4, "=SUM(A$1:C$1)", lExpectedinE); - auto lExpectedinF = - [ -#if defined _MSC_VER && !defined __clang__ && __cplusplus <= 201703L - // see <https://developercommunity2.visualstudio.com/t/ - // Lambdas-require-capturing-constant-value/907628> "Lambdas require capturing constant - // values" - ROW_RANGE -#endif - ](SCROW n) { return ((2 * n + 1 - ROW_RANGE) * ROW_RANGE) / 2.0; }; + auto lExpectedinF = [](SCROW n) { return ((2 * n + 1 - ROW_RANGE) * ROW_RANGE) / 2.0; }; columnTest(5, "=SUM(A1:A10)", lExpectedinF); auto lExpectedinG = [](SCROW n) { return ((n + 1) * n) / 2.0; }; |