Merge pull request #4117 from pleroy/17.11.5

Support for VS 17.11.5
mockingbirdnest · Oct 16, 2024 · ff268a0 · ff268a0
2 parents 6afb36e + 92e387a
commit ff268a0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git 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<int> const&)int_ptr1, Eq(3));
 #endif
   not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);

diff --git a/geometry/hilbert.hpp b/geometry/hilbert.hpp
@@ -72,7 +72,8 @@ struct Hilbert<T1, T2> : 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<T, T> : 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<T, T> : 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<T, T> : 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
@@ -47,7 +47,8 @@ auto Hilbert<T, T>::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<typename T1, typename T2>
   requires hilbert<T1, T2>
 auto Hilbert<T1, T2>::InnerProduct(T1 const& t1, T2 const& t2)

diff --git a/numerics/polynomial_in_чебышёв_basis_body.hpp b/numerics/polynomial_in_чебышёв_basis_body.hpp
@@ -114,7 +114,8 @@ PolynomialInЧебышёвBasis<Value_, Argument_, std::nullopt>::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
@@ -385,7 +385,8 @@ EulerSolver<InertialFrame, PrincipalAxesFrame>::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
@@ -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
 }