From 92e387ab37b4b3315f0dd13cc4727cabef73fa62 Mon Sep 17 00:00:00 2001 From: pleroy Date: Wed, 16 Oct 2024 22:41:49 +0200 Subject: [PATCH] Support for VS 17.11.5. --- base/not_null_test.cpp | 3 ++- geometry/hilbert.hpp | 12 ++++++++---- geometry/hilbert_body.hpp | 3 ++- ...1\321\213\321\210\321\221\320\262_basis_body.hpp" | 3 ++- physics/euler_solver_body.hpp | 3 ++- tools/journal_proto_processor.cpp | 3 ++- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/base/not_null_test.cpp b/base/not_null_test.cpp index 90460624d0..b9700a9348 100644 --- a/base/not_null_test.cpp +++ b/base/not_null_test.cpp @@ -92,7 +92,8 @@ TEST_F(NotNullTest, Move) { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120) + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123) EXPECT_THAT(*(std::unique_ptr const&)int_ptr1, Eq(3)); #endif not_null> int_ptr2 = std::move(int_ptr1); diff --git a/geometry/hilbert.hpp b/geometry/hilbert.hpp index 36e05b5f15..4139a16522 100644 --- a/geometry/hilbert.hpp +++ b/geometry/hilbert.hpp @@ -72,7 +72,8 @@ struct Hilbert : not_constructible { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120 + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123 { // NOLINT return _grassmann::internal::InnerProduct(t1, t2); } @@ -100,7 +101,8 @@ struct Hilbert : not_constructible { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120 + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123 { // NOLINT return _grassmann::internal::InnerProduct(t1, t2); } @@ -121,7 +123,8 @@ struct Hilbert : not_constructible { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120 + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123 { // NOLINT return t.Norm²(); } @@ -142,7 +145,8 @@ struct Hilbert : not_constructible { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120 + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123 { // NOLINT return t.Norm(); } diff --git a/geometry/hilbert_body.hpp b/geometry/hilbert_body.hpp index 104bd9fc3b..0dddcaed86 100644 --- a/geometry/hilbert_body.hpp +++ b/geometry/hilbert_body.hpp @@ -47,7 +47,8 @@ auto Hilbert::Norm(T const& t) -> NormType { _MSC_FULL_VER == 193'833'135 || \ _MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120) + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123) template requires hilbert auto Hilbert::InnerProduct(T1 const& t1, T2 const& t2) diff --git "a/numerics/polynomial_in_\321\207\320\265\320\261\321\213\321\210\321\221\320\262_basis_body.hpp" "b/numerics/polynomial_in_\321\207\320\265\320\261\321\213\321\210\321\221\320\262_basis_body.hpp" index f6ab33ca03..dd89176b1d 100644 --- "a/numerics/polynomial_in_\321\207\320\265\320\261\321\213\321\210\321\221\320\262_basis_body.hpp" +++ "b/numerics/polynomial_in_\321\207\320\265\320\261\321\213\321\210\321\221\320\262_basis_body.hpp" @@ -114,7 +114,8 @@ PolynomialInЧебышёвBasis::ReadFromMessag #if PRINCIPIA_COMPILER_MSVC && \ (_MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120) + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123) std::abort(); #endif } diff --git a/physics/euler_solver_body.hpp b/physics/euler_solver_body.hpp index 7ea3b649c3..34381b2021 100644 --- a/physics/euler_solver_body.hpp +++ b/physics/euler_solver_body.hpp @@ -385,7 +385,8 @@ EulerSolver::AttitudeAt( #if PRINCIPIA_COMPILER_MSVC && \ (_MSC_FULL_VER == 193'933'523 || \ _MSC_FULL_VER == 194'033'813 || \ - _MSC_FULL_VER == 194'134'120) + _MSC_FULL_VER == 194'134'120 || \ + _MSC_FULL_VER == 194'134'123) std::abort(); #endif } diff --git a/tools/journal_proto_processor.cpp b/tools/journal_proto_processor.cpp index 35ef65645b..7ad65da77b 100644 --- a/tools/journal_proto_processor.cpp +++ b/tools/journal_proto_processor.cpp @@ -1948,7 +1948,8 @@ std::string JournalProtoProcessor::MarshalAs( LOG(FATAL) << "Bad marshaler for " << descriptor->name(); #if PRINCIPIA_COMPILER_MSVC && \ (_MSC_FULL_VER == 193'933'523 || \ - _MSC_FULL_VER == 194'033'813) + _MSC_FULL_VER == 194'033'813 || \ + _MSC_FULL_VER == 194'134'123) std::abort(); #endif }