Skip to content

Commit

Permalink
Bump compiler version
Browse files Browse the repository at this point in the history
  • Loading branch information
eggrobin committed Apr 22, 2023
1 parent 7b93a3b commit 135a446
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
3 changes: 2 additions & 1 deletion base/not_null_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ TEST_F(NotNullTest, Move) {
_MSC_FULL_VER == 192'930'147 || \
_MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216)
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217)
EXPECT_THAT(*(std::unique_ptr<int> const&)int_ptr1, Eq(3));
#endif
not_null<std::unique_ptr<int>> int_ptr2 = std::move(int_ptr1);
Expand Down
12 changes: 8 additions & 4 deletions geometry/hilbert.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ struct Hilbert<T1, T2,
static InnerProductType InnerProduct(T1 const& t1, T2 const& t2)
#if _MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217
{ // NOLINT
return _grassmann::internal::InnerProduct(t1, t2);
}
Expand All @@ -86,7 +87,8 @@ struct Hilbert<T, T,
static InnerProductType InnerProduct(T const& t1, T const& t2)
#if _MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217
{ // NOLINT
return _grassmann::internal::InnerProduct(t1, t2);
}
Expand All @@ -98,7 +100,8 @@ struct Hilbert<T, T,
static Norm²Type Norm²(T const& t)
#if _MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217
{ // NOLINT
return t.Norm²();
}
Expand All @@ -110,7 +113,8 @@ struct Hilbert<T, T,
static NormType Norm(T const& t)
#if _MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217
{ // NOLINT
return t.Norm();
}
Expand Down
3 changes: 2 additions & 1 deletion geometry/hilbert_body.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ auto Hilbert<T, T, std::enable_if_t<is_quantity_v<T>>>::Norm(

#if !(_MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216)
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217)
template<typename T1, typename T2>
auto Hilbert<T1, T2,
std::void_t<decltype(InnerProduct(std::declval<T1>(),
Expand Down
3 changes: 2 additions & 1 deletion geometry/permutation_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ TEST_F(PermutationTest, SerializationSuccess) {
#if PRINCIPIA_COMPILER_MSVC && \
(_MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216)
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217)
using Perm =
std::conditional<std::is_same_v<decltype(cp), EvenPermutation const>,
PermutationR1R2,
Expand Down
Binary file modified ksp_plugin_adapter_stub/ksp_plugin_adapter_stub.dll
Binary file not shown.
Binary file modified ksp_plugin_adapter_stub/ksp_plugin_adapter_stub.pdb
Binary file not shown.
3 changes: 2 additions & 1 deletion numerics/polynomial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
_MSC_FULL_VER == 192'930'147 || \
_MSC_FULL_VER == 193'431'937 || \
_MSC_FULL_VER == 193'431'942 || \
_MSC_FULL_VER == 193'532'216)
_MSC_FULL_VER == 193'532'216 || \
_MSC_FULL_VER == 193'532'217)

namespace principia {
namespace numerics {
Expand Down

0 comments on commit 135a446

Please sign in to comment.