From 41622b87aeeb6d5e9f03f12d0a6847e0a04e6174 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 2 Jul 2026 19:30:59 +0100 Subject: [PATCH] chore: Enable modernize-unary-static-assert (#7705) --- .clang-tidy | 1 - include/xrpl/basics/base_uint.h | 2 +- include/xrpl/beast/utility/Journal.h | 48 ++-- include/xrpl/ledger/CachedView.h | 2 +- include/xrpl/ledger/detail/ReadViewFwdRange.h | 4 +- include/xrpl/protocol/STObject.h | 2 +- include/xrpl/protocol/Serializer.h | 2 +- src/libxrpl/protocol/Serializer.cpp | 2 +- src/libxrpl/protocol/digest.cpp | 6 +- src/test/app/PayStrand_test.cpp | 2 +- src/test/basics/Buffer_test.cpp | 4 +- src/test/jtx/Env_test.cpp | 8 +- src/test/protocol/Quality_test.cpp | 4 +- src/test/protocol/STObject_test.cpp | 6 +- src/test/protocol/SeqProxy_test.cpp | 220 +++++++++--------- src/test/shamap/SHAMap_test.cpp | 88 +++---- src/xrpld/app/misc/detail/TxQ.cpp | 8 +- 17 files changed, 203 insertions(+), 206 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 84849db7a0..2b0b7e4418 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -80,7 +80,6 @@ Checks: "-*, -modernize-replace-random-shuffle, -modernize-return-braced-init-list, -modernize-shrink-to-fit, - -modernize-unary-static-assert, -modernize-use-auto, -modernize-use-bool-literals, -modernize-use-constraints, diff --git a/include/xrpl/basics/base_uint.h b/include/xrpl/basics/base_uint.h index e6ca1993f9..c60fbf35b4 100644 --- a/include/xrpl/basics/base_uint.h +++ b/include/xrpl/basics/base_uint.h @@ -97,7 +97,7 @@ public: // static constexpr std::size_t kBytes = Bits / 8; - static_assert(sizeof(data_) == kBytes, ""); + static_assert(sizeof(data_) == kBytes); using size_type = std::size_t; using difference_type = std::ptrdiff_t; diff --git a/include/xrpl/beast/utility/Journal.h b/include/xrpl/beast/utility/Journal.h index ac08b1384b..3de3cfb0e0 100644 --- a/include/xrpl/beast/utility/Journal.h +++ b/include/xrpl/beast/utility/Journal.h @@ -108,12 +108,12 @@ public: }; #ifndef __INTELLISENSE__ - static_assert(!std::is_default_constructible_v, ""); - static_assert(!std::is_copy_constructible_v, ""); - static_assert(!std::is_move_constructible_v, ""); - static_assert(!std::is_copy_assignable_v, ""); - static_assert(!std::is_move_assignable_v, ""); - static_assert(std::is_nothrow_destructible_v, ""); + static_assert(!std::is_default_constructible_v); + static_assert(!std::is_copy_constructible_v); + static_assert(!std::is_move_constructible_v); + static_assert(!std::is_copy_assignable_v); + static_assert(!std::is_move_assignable_v); + static_assert(std::is_nothrow_destructible_v); #endif /** Returns a Sink which does nothing. */ @@ -164,12 +164,12 @@ public: }; #ifndef __INTELLISENSE__ - static_assert(!std::is_default_constructible_v, ""); - static_assert(std::is_copy_constructible_v, ""); - static_assert(std::is_move_constructible_v, ""); - static_assert(!std::is_copy_assignable_v, ""); - static_assert(!std::is_move_assignable_v, ""); - static_assert(std::is_nothrow_destructible_v, ""); + static_assert(!std::is_default_constructible_v); + static_assert(std::is_copy_constructible_v); + static_assert(std::is_move_constructible_v); + static_assert(!std::is_copy_assignable_v); + static_assert(!std::is_move_assignable_v); + static_assert(std::is_nothrow_destructible_v); #endif //-------------------------------------------------------------------------- @@ -246,12 +246,12 @@ public: }; #ifndef __INTELLISENSE__ - static_assert(std::is_default_constructible_v, ""); - static_assert(std::is_copy_constructible_v, ""); - static_assert(std::is_move_constructible_v, ""); - static_assert(!std::is_copy_assignable_v, ""); - static_assert(!std::is_move_assignable_v, ""); - static_assert(std::is_nothrow_destructible_v, ""); + static_assert(std::is_default_constructible_v); + static_assert(std::is_copy_constructible_v); + static_assert(std::is_move_constructible_v); + static_assert(!std::is_copy_assignable_v); + static_assert(!std::is_move_assignable_v); + static_assert(std::is_nothrow_destructible_v); #endif //-------------------------------------------------------------------------- @@ -329,12 +329,12 @@ public: }; #ifndef __INTELLISENSE__ -static_assert(!std::is_default_constructible_v, ""); -static_assert(std::is_copy_constructible_v, ""); -static_assert(std::is_move_constructible_v, ""); -static_assert(std::is_copy_assignable_v, ""); -static_assert(std::is_move_assignable_v, ""); -static_assert(std::is_nothrow_destructible_v, ""); +static_assert(!std::is_default_constructible_v); +static_assert(std::is_copy_constructible_v); +static_assert(std::is_move_constructible_v); +static_assert(std::is_copy_assignable_v); +static_assert(std::is_move_assignable_v); +static_assert(std::is_nothrow_destructible_v); #endif //------------------------------------------------------------------------------ diff --git a/include/xrpl/ledger/CachedView.h b/include/xrpl/ledger/CachedView.h index f83c3e1297..1da3a67563 100644 --- a/include/xrpl/ledger/CachedView.h +++ b/include/xrpl/ledger/CachedView.h @@ -141,7 +141,7 @@ template class CachedView : public detail::CachedViewImpl { private: - static_assert(std::is_base_of_v, ""); + static_assert(std::is_base_of_v); std::shared_ptr sp_; diff --git a/include/xrpl/ledger/detail/ReadViewFwdRange.h b/include/xrpl/ledger/detail/ReadViewFwdRange.h index 82d8b59c6a..19ac0698c2 100644 --- a/include/xrpl/ledger/detail/ReadViewFwdRange.h +++ b/include/xrpl/ledger/detail/ReadViewFwdRange.h @@ -108,8 +108,8 @@ public: std::optional mutable cache_; }; - static_assert(std::is_nothrow_move_constructible{}, ""); - static_assert(std::is_nothrow_move_assignable{}, ""); + static_assert(std::is_nothrow_move_constructible{}); + static_assert(std::is_nothrow_move_assignable{}); using const_iterator = Iterator; diff --git a/include/xrpl/protocol/STObject.h b/include/xrpl/protocol/STObject.h index c254a37aaf..a60e8f7fe8 100644 --- a/include/xrpl/protocol/STObject.h +++ b/include/xrpl/protocol/STObject.h @@ -1241,7 +1241,7 @@ template void STObject::setFieldUsingSetValue(SField const& field, V value) { - static_assert(!std::is_lvalue_reference_v, ""); + static_assert(!std::is_lvalue_reference_v); STBase* rf = getPField(field, true); diff --git a/include/xrpl/protocol/Serializer.h b/include/xrpl/protocol/Serializer.h index 1d0453d6aa..73bd9c8289 100644 --- a/include/xrpl/protocol/Serializer.h +++ b/include/xrpl/protocol/Serializer.h @@ -334,7 +334,7 @@ public: template explicit SerialIter(std::uint8_t const (&data)[N]) : SerialIter(&data[0], N) { - static_assert(N > 0, ""); + static_assert(N > 0); } [[nodiscard]] bool diff --git a/src/libxrpl/protocol/Serializer.cpp b/src/libxrpl/protocol/Serializer.cpp index d500919df9..1eda04705f 100644 --- a/src/libxrpl/protocol/Serializer.cpp +++ b/src/libxrpl/protocol/Serializer.cpp @@ -444,7 +444,7 @@ template T SerialIter::getRawHelper(int size) { - static_assert(std::is_same_v || std::is_same_v, ""); + static_assert(std::is_same_v || std::is_same_v); if (remain_ < size) Throw("invalid SerialIter getRaw"); T result(size); diff --git a/src/libxrpl/protocol/digest.cpp b/src/libxrpl/protocol/digest.cpp index 2e1b2b25cf..1d84f8779e 100644 --- a/src/libxrpl/protocol/digest.cpp +++ b/src/libxrpl/protocol/digest.cpp @@ -9,7 +9,7 @@ namespace xrpl { OpensslRipemd160Hasher::OpensslRipemd160Hasher() { - static_assert(sizeof(decltype(OpensslRipemd160Hasher::ctx_)) == sizeof(RIPEMD160_CTX), ""); + static_assert(sizeof(decltype(OpensslRipemd160Hasher::ctx_)) == sizeof(RIPEMD160_CTX)); auto const ctx = reinterpret_cast(ctx_); RIPEMD160_Init(ctx); } @@ -34,7 +34,7 @@ operator result_type() noexcept OpensslSha512Hasher::OpensslSha512Hasher() { - static_assert(sizeof(decltype(OpensslSha512Hasher::ctx_)) == sizeof(SHA512_CTX), ""); + static_assert(sizeof(decltype(OpensslSha512Hasher::ctx_)) == sizeof(SHA512_CTX)); auto const ctx = reinterpret_cast(ctx_); SHA512_Init(ctx); } @@ -59,7 +59,7 @@ operator result_type() noexcept OpensslSha256Hasher::OpensslSha256Hasher() { - static_assert(sizeof(decltype(OpensslSha256Hasher::ctx_)) == sizeof(SHA256_CTX), ""); + static_assert(sizeof(decltype(OpensslSha256Hasher::ctx_)) == sizeof(SHA256_CTX)); auto const ctx = reinterpret_cast(ctx_); SHA256_Init(ctx); } diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp index 11a0e5bab0..ddbcfe8b70 100644 --- a/src/test/app/PayStrand_test.cpp +++ b/src/test/app/PayStrand_test.cpp @@ -112,7 +112,7 @@ class ElementComboIter }; std::uint16_t state_ = 0; - static_assert(safeCast(SB::Last) <= sizeof(decltype(state_)) * 8, ""); + static_assert(safeCast(SB::Last) <= sizeof(decltype(state_)) * 8); STPathElement const* prev_ = nullptr; // disallow iss and cur to be specified with acc is specified (simplifies // some tests) diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp index 816a697ca4..c748a3f9dd 100644 --- a/src/test/basics/Buffer_test.cpp +++ b/src/test/basics/Buffer_test.cpp @@ -103,8 +103,8 @@ struct Buffer_test : beast::unit_test::Suite { testcase("Move Construction / Assignment"); - static_assert(std::is_nothrow_move_constructible_v, ""); - static_assert(std::is_nothrow_move_assignable_v, ""); + static_assert(std::is_nothrow_move_constructible_v); + static_assert(std::is_nothrow_move_assignable_v); { // Move-construct from empty buf Buffer x; diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp index d82cb86b36..47cfb604f4 100644 --- a/src/test/jtx/Env_test.cpp +++ b/src/test/jtx/Env_test.cpp @@ -110,10 +110,10 @@ public: PrettyAmount(0u); // NOLINT(bugprone-unused-raii) PrettyAmount(1u); // NOLINT(bugprone-unused-raii) PrettyAmount(-1); // NOLINT(bugprone-unused-raii) - static_assert(!std::is_trivially_constructible_v, ""); - static_assert(!std::is_trivially_constructible_v, ""); - static_assert(!std::is_trivially_constructible_v, ""); - static_assert(!std::is_trivially_constructible_v, ""); + static_assert(!std::is_trivially_constructible_v); + static_assert(!std::is_trivially_constructible_v); + static_assert(!std::is_trivially_constructible_v); + static_assert(!std::is_trivially_constructible_v); try { diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp index df95cea8ef..db81886e94 100644 --- a/src/test/protocol/Quality_test.cpp +++ b/src/test/protocol/Quality_test.cpp @@ -24,7 +24,7 @@ public: static STAmount amount(Integer integer, std::enable_if_t>* = 0) { - static_assert(std::is_integral_v, ""); + static_assert(std::is_integral_v); return STAmount(integer, false); } @@ -32,7 +32,7 @@ public: static STAmount amount(Integer integer, std::enable_if_t>* = 0) { - static_assert(std::is_integral_v, ""); + static_assert(std::is_integral_v); if (integer < 0) return STAmount(-integer, true); return STAmount(integer, false); diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp index b823b24962..8b7db632c5 100644 --- a/src/test/protocol/STObject_test.cpp +++ b/src/test/protocol/STObject_test.cpp @@ -356,8 +356,7 @@ public: { STObject st(sfGeneric); auto const v = ~st[~sf1Outer]; - static_assert( - std::is_same_v, std::optional>, ""); + static_assert(std::is_same_v, std::optional>); } // UDT scalar fields @@ -431,8 +430,7 @@ public: BEAST_EXPECT(cst[~sf]->size() == 2); // NOLINT(bugprone-unchecked-optional-access) BEAST_EXPECT(cst[sf][0] == 1); BEAST_EXPECT(cst[sf][1] == 2); - static_assert( - std::is_same_v const&>, ""); + static_assert(std::is_same_v const&>); } // Default by reference field diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp index 90345ddc22..44aab41992 100644 --- a/src/test/protocol/SeqProxy_test.cpp +++ b/src/test/protocol/SeqProxy_test.cpp @@ -81,128 +81,128 @@ struct SeqProxy_test : public beast::unit_test::Suite static constexpr SeqProxy kTicBig{kTicket, kUintMax}; // Verify operation of value(), isSeq() and isTicket(). - static_assert(expectValues(kSeqZero, 0, kSeq), ""); - static_assert(expectValues(kSeqSmall, 1, kSeq), ""); - static_assert(expectValues(kSeqMiD0, 2, kSeq), ""); - static_assert(expectValues(kSeqMiD1, 2, kSeq), ""); - static_assert(expectValues(kSeqBig, kUintMax, kSeq), ""); + static_assert(expectValues(kSeqZero, 0, kSeq)); + static_assert(expectValues(kSeqSmall, 1, kSeq)); + static_assert(expectValues(kSeqMiD0, 2, kSeq)); + static_assert(expectValues(kSeqMiD1, 2, kSeq)); + static_assert(expectValues(kSeqBig, kUintMax, kSeq)); - static_assert(expectValues(kTicZero, 0, kTicket), ""); - static_assert(expectValues(kTicSmall, 1, kTicket), ""); - static_assert(expectValues(kTicMid0, 2, kTicket), ""); - static_assert(expectValues(kTicMid1, 2, kTicket), ""); - static_assert(expectValues(kTicBig, kUintMax, kTicket), ""); + static_assert(expectValues(kTicZero, 0, kTicket)); + static_assert(expectValues(kTicSmall, 1, kTicket)); + static_assert(expectValues(kTicMid0, 2, kTicket)); + static_assert(expectValues(kTicMid1, 2, kTicket)); + static_assert(expectValues(kTicBig, kUintMax, kTicket)); // Verify expected behavior of comparison operators. - static_assert(expectEq(kSeqZero, kSeqZero), ""); - static_assert(expectLt(kSeqZero, kSeqSmall), ""); - static_assert(expectLt(kSeqZero, kSeqMiD0), ""); - static_assert(expectLt(kSeqZero, kSeqMiD1), ""); - static_assert(expectLt(kSeqZero, kSeqBig), ""); - static_assert(expectLt(kSeqZero, kTicZero), ""); - static_assert(expectLt(kSeqZero, kTicSmall), ""); - static_assert(expectLt(kSeqZero, kTicMid0), ""); - static_assert(expectLt(kSeqZero, kTicMid1), ""); - static_assert(expectLt(kSeqZero, kTicBig), ""); + static_assert(expectEq(kSeqZero, kSeqZero)); + static_assert(expectLt(kSeqZero, kSeqSmall)); + static_assert(expectLt(kSeqZero, kSeqMiD0)); + static_assert(expectLt(kSeqZero, kSeqMiD1)); + static_assert(expectLt(kSeqZero, kSeqBig)); + static_assert(expectLt(kSeqZero, kTicZero)); + static_assert(expectLt(kSeqZero, kTicSmall)); + static_assert(expectLt(kSeqZero, kTicMid0)); + static_assert(expectLt(kSeqZero, kTicMid1)); + static_assert(expectLt(kSeqZero, kTicBig)); - static_assert(expectGt(kSeqSmall, kSeqZero), ""); - static_assert(expectEq(kSeqSmall, kSeqSmall), ""); - static_assert(expectLt(kSeqSmall, kSeqMiD0), ""); - static_assert(expectLt(kSeqSmall, kSeqMiD1), ""); - static_assert(expectLt(kSeqSmall, kSeqBig), ""); - static_assert(expectLt(kSeqSmall, kTicZero), ""); - static_assert(expectLt(kSeqSmall, kTicSmall), ""); - static_assert(expectLt(kSeqSmall, kTicMid0), ""); - static_assert(expectLt(kSeqSmall, kTicMid1), ""); - static_assert(expectLt(kSeqSmall, kTicBig), ""); + static_assert(expectGt(kSeqSmall, kSeqZero)); + static_assert(expectEq(kSeqSmall, kSeqSmall)); + static_assert(expectLt(kSeqSmall, kSeqMiD0)); + static_assert(expectLt(kSeqSmall, kSeqMiD1)); + static_assert(expectLt(kSeqSmall, kSeqBig)); + static_assert(expectLt(kSeqSmall, kTicZero)); + static_assert(expectLt(kSeqSmall, kTicSmall)); + static_assert(expectLt(kSeqSmall, kTicMid0)); + static_assert(expectLt(kSeqSmall, kTicMid1)); + static_assert(expectLt(kSeqSmall, kTicBig)); - static_assert(expectGt(kSeqMiD0, kSeqZero), ""); - static_assert(expectGt(kSeqMiD0, kSeqSmall), ""); - static_assert(expectEq(kSeqMiD0, kSeqMiD0), ""); - static_assert(expectEq(kSeqMiD0, kSeqMiD1), ""); - static_assert(expectLt(kSeqMiD0, kSeqBig), ""); - static_assert(expectLt(kSeqMiD0, kTicZero), ""); - static_assert(expectLt(kSeqMiD0, kTicSmall), ""); - static_assert(expectLt(kSeqMiD0, kTicMid0), ""); - static_assert(expectLt(kSeqMiD0, kTicMid1), ""); - static_assert(expectLt(kSeqMiD0, kTicBig), ""); + static_assert(expectGt(kSeqMiD0, kSeqZero)); + static_assert(expectGt(kSeqMiD0, kSeqSmall)); + static_assert(expectEq(kSeqMiD0, kSeqMiD0)); + static_assert(expectEq(kSeqMiD0, kSeqMiD1)); + static_assert(expectLt(kSeqMiD0, kSeqBig)); + static_assert(expectLt(kSeqMiD0, kTicZero)); + static_assert(expectLt(kSeqMiD0, kTicSmall)); + static_assert(expectLt(kSeqMiD0, kTicMid0)); + static_assert(expectLt(kSeqMiD0, kTicMid1)); + static_assert(expectLt(kSeqMiD0, kTicBig)); - static_assert(expectGt(kSeqMiD1, kSeqZero), ""); - static_assert(expectGt(kSeqMiD1, kSeqSmall), ""); - static_assert(expectEq(kSeqMiD1, kSeqMiD0), ""); - static_assert(expectEq(kSeqMiD1, kSeqMiD1), ""); - static_assert(expectLt(kSeqMiD1, kSeqBig), ""); - static_assert(expectLt(kSeqMiD1, kTicZero), ""); - static_assert(expectLt(kSeqMiD1, kTicSmall), ""); - static_assert(expectLt(kSeqMiD1, kTicMid0), ""); - static_assert(expectLt(kSeqMiD1, kTicMid1), ""); - static_assert(expectLt(kSeqMiD1, kTicBig), ""); + static_assert(expectGt(kSeqMiD1, kSeqZero)); + static_assert(expectGt(kSeqMiD1, kSeqSmall)); + static_assert(expectEq(kSeqMiD1, kSeqMiD0)); + static_assert(expectEq(kSeqMiD1, kSeqMiD1)); + static_assert(expectLt(kSeqMiD1, kSeqBig)); + static_assert(expectLt(kSeqMiD1, kTicZero)); + static_assert(expectLt(kSeqMiD1, kTicSmall)); + static_assert(expectLt(kSeqMiD1, kTicMid0)); + static_assert(expectLt(kSeqMiD1, kTicMid1)); + static_assert(expectLt(kSeqMiD1, kTicBig)); - static_assert(expectGt(kSeqBig, kSeqZero), ""); - static_assert(expectGt(kSeqBig, kSeqSmall), ""); - static_assert(expectGt(kSeqBig, kSeqMiD0), ""); - static_assert(expectGt(kSeqBig, kSeqMiD1), ""); - static_assert(expectEq(kSeqBig, kSeqBig), ""); - static_assert(expectLt(kSeqBig, kTicZero), ""); - static_assert(expectLt(kSeqBig, kTicSmall), ""); - static_assert(expectLt(kSeqBig, kTicMid0), ""); - static_assert(expectLt(kSeqBig, kTicMid1), ""); - static_assert(expectLt(kSeqBig, kTicBig), ""); + static_assert(expectGt(kSeqBig, kSeqZero)); + static_assert(expectGt(kSeqBig, kSeqSmall)); + static_assert(expectGt(kSeqBig, kSeqMiD0)); + static_assert(expectGt(kSeqBig, kSeqMiD1)); + static_assert(expectEq(kSeqBig, kSeqBig)); + static_assert(expectLt(kSeqBig, kTicZero)); + static_assert(expectLt(kSeqBig, kTicSmall)); + static_assert(expectLt(kSeqBig, kTicMid0)); + static_assert(expectLt(kSeqBig, kTicMid1)); + static_assert(expectLt(kSeqBig, kTicBig)); - static_assert(expectGt(kTicZero, kSeqZero), ""); - static_assert(expectGt(kTicZero, kSeqSmall), ""); - static_assert(expectGt(kTicZero, kSeqMiD0), ""); - static_assert(expectGt(kTicZero, kSeqMiD1), ""); - static_assert(expectGt(kTicZero, kSeqBig), ""); - static_assert(expectEq(kTicZero, kTicZero), ""); - static_assert(expectLt(kTicZero, kTicSmall), ""); - static_assert(expectLt(kTicZero, kTicMid0), ""); - static_assert(expectLt(kTicZero, kTicMid1), ""); - static_assert(expectLt(kTicZero, kTicBig), ""); + static_assert(expectGt(kTicZero, kSeqZero)); + static_assert(expectGt(kTicZero, kSeqSmall)); + static_assert(expectGt(kTicZero, kSeqMiD0)); + static_assert(expectGt(kTicZero, kSeqMiD1)); + static_assert(expectGt(kTicZero, kSeqBig)); + static_assert(expectEq(kTicZero, kTicZero)); + static_assert(expectLt(kTicZero, kTicSmall)); + static_assert(expectLt(kTicZero, kTicMid0)); + static_assert(expectLt(kTicZero, kTicMid1)); + static_assert(expectLt(kTicZero, kTicBig)); - static_assert(expectGt(kTicSmall, kSeqZero), ""); - static_assert(expectGt(kTicSmall, kSeqSmall), ""); - static_assert(expectGt(kTicSmall, kSeqMiD0), ""); - static_assert(expectGt(kTicSmall, kSeqMiD1), ""); - static_assert(expectGt(kTicSmall, kSeqBig), ""); - static_assert(expectGt(kTicSmall, kTicZero), ""); - static_assert(expectEq(kTicSmall, kTicSmall), ""); - static_assert(expectLt(kTicSmall, kTicMid0), ""); - static_assert(expectLt(kTicSmall, kTicMid1), ""); - static_assert(expectLt(kTicSmall, kTicBig), ""); + static_assert(expectGt(kTicSmall, kSeqZero)); + static_assert(expectGt(kTicSmall, kSeqSmall)); + static_assert(expectGt(kTicSmall, kSeqMiD0)); + static_assert(expectGt(kTicSmall, kSeqMiD1)); + static_assert(expectGt(kTicSmall, kSeqBig)); + static_assert(expectGt(kTicSmall, kTicZero)); + static_assert(expectEq(kTicSmall, kTicSmall)); + static_assert(expectLt(kTicSmall, kTicMid0)); + static_assert(expectLt(kTicSmall, kTicMid1)); + static_assert(expectLt(kTicSmall, kTicBig)); - static_assert(expectGt(kTicMid0, kSeqZero), ""); - static_assert(expectGt(kTicMid0, kSeqSmall), ""); - static_assert(expectGt(kTicMid0, kSeqMiD0), ""); - static_assert(expectGt(kTicMid0, kSeqMiD1), ""); - static_assert(expectGt(kTicMid0, kSeqBig), ""); - static_assert(expectGt(kTicMid0, kTicZero), ""); - static_assert(expectGt(kTicMid0, kTicSmall), ""); - static_assert(expectEq(kTicMid0, kTicMid0), ""); - static_assert(expectEq(kTicMid0, kTicMid1), ""); - static_assert(expectLt(kTicMid0, kTicBig), ""); + static_assert(expectGt(kTicMid0, kSeqZero)); + static_assert(expectGt(kTicMid0, kSeqSmall)); + static_assert(expectGt(kTicMid0, kSeqMiD0)); + static_assert(expectGt(kTicMid0, kSeqMiD1)); + static_assert(expectGt(kTicMid0, kSeqBig)); + static_assert(expectGt(kTicMid0, kTicZero)); + static_assert(expectGt(kTicMid0, kTicSmall)); + static_assert(expectEq(kTicMid0, kTicMid0)); + static_assert(expectEq(kTicMid0, kTicMid1)); + static_assert(expectLt(kTicMid0, kTicBig)); - static_assert(expectGt(kTicMid1, kSeqZero), ""); - static_assert(expectGt(kTicMid1, kSeqSmall), ""); - static_assert(expectGt(kTicMid1, kSeqMiD0), ""); - static_assert(expectGt(kTicMid1, kSeqMiD1), ""); - static_assert(expectGt(kTicMid1, kSeqBig), ""); - static_assert(expectGt(kTicMid1, kTicZero), ""); - static_assert(expectGt(kTicMid1, kTicSmall), ""); - static_assert(expectEq(kTicMid1, kTicMid0), ""); - static_assert(expectEq(kTicMid1, kTicMid1), ""); - static_assert(expectLt(kTicMid1, kTicBig), ""); + static_assert(expectGt(kTicMid1, kSeqZero)); + static_assert(expectGt(kTicMid1, kSeqSmall)); + static_assert(expectGt(kTicMid1, kSeqMiD0)); + static_assert(expectGt(kTicMid1, kSeqMiD1)); + static_assert(expectGt(kTicMid1, kSeqBig)); + static_assert(expectGt(kTicMid1, kTicZero)); + static_assert(expectGt(kTicMid1, kTicSmall)); + static_assert(expectEq(kTicMid1, kTicMid0)); + static_assert(expectEq(kTicMid1, kTicMid1)); + static_assert(expectLt(kTicMid1, kTicBig)); - static_assert(expectGt(kTicBig, kSeqZero), ""); - static_assert(expectGt(kTicBig, kSeqSmall), ""); - static_assert(expectGt(kTicBig, kSeqMiD0), ""); - static_assert(expectGt(kTicBig, kSeqMiD1), ""); - static_assert(expectGt(kTicBig, kSeqBig), ""); - static_assert(expectGt(kTicBig, kTicZero), ""); - static_assert(expectGt(kTicBig, kTicSmall), ""); - static_assert(expectGt(kTicBig, kTicMid0), ""); - static_assert(expectGt(kTicBig, kTicMid1), ""); - static_assert(expectEq(kTicBig, kTicBig), ""); + static_assert(expectGt(kTicBig, kSeqZero)); + static_assert(expectGt(kTicBig, kSeqSmall)); + static_assert(expectGt(kTicBig, kSeqMiD0)); + static_assert(expectGt(kTicBig, kSeqMiD1)); + static_assert(expectGt(kTicBig, kSeqBig)); + static_assert(expectGt(kTicBig, kTicZero)); + static_assert(expectGt(kTicBig, kTicSmall)); + static_assert(expectGt(kTicBig, kTicMid0)); + static_assert(expectGt(kTicBig, kTicMid1)); + static_assert(expectEq(kTicBig, kTicBig)); // Verify streaming. BEAST_EXPECT(streamTest(kSeqZero)); diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp index ab7e01e3af..5ff5ef5e05 100644 --- a/src/test/shamap/SHAMap_test.cpp +++ b/src/test/shamap/SHAMap_test.cpp @@ -26,57 +26,57 @@ namespace xrpl::tests { #ifndef __INTELLISENSE__ -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(!std::is_default_constructible{}, ""); -static_assert(!std::is_copy_constructible{}, ""); -static_assert(!std::is_copy_assignable{}, ""); -static_assert(!std::is_move_constructible{}, ""); -static_assert(!std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(!std::is_default_constructible{}); +static_assert(!std::is_copy_constructible{}); +static_assert(!std::is_copy_assignable{}); +static_assert(!std::is_move_constructible{}); +static_assert(!std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(std::is_copy_constructible{}, ""); -static_assert(std::is_copy_assignable{}, ""); -static_assert(std::is_move_constructible{}, ""); -static_assert(std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(std::is_copy_constructible{}); +static_assert(std::is_copy_assignable{}); +static_assert(std::is_move_constructible{}); +static_assert(std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(!std::is_default_constructible{}, ""); -static_assert(!std::is_copy_constructible{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(!std::is_default_constructible{}); +static_assert(!std::is_copy_constructible{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(std::is_default_constructible{}, ""); -static_assert(std::is_copy_constructible{}, ""); -static_assert(std::is_copy_assignable{}, ""); -static_assert(std::is_move_constructible{}, ""); -static_assert(std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(std::is_default_constructible{}); +static_assert(std::is_copy_constructible{}); +static_assert(std::is_copy_assignable{}); +static_assert(std::is_move_constructible{}); +static_assert(std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(std::is_default_constructible{}, ""); -static_assert(std::is_copy_constructible{}, ""); -static_assert(std::is_copy_assignable{}, ""); -static_assert(std::is_move_constructible{}, ""); -static_assert(std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(std::is_default_constructible{}); +static_assert(std::is_copy_constructible{}); +static_assert(std::is_copy_assignable{}); +static_assert(std::is_move_constructible{}); +static_assert(std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(!std::is_default_constructible{}, ""); -static_assert(!std::is_copy_constructible{}, ""); -static_assert(!std::is_copy_assignable{}, ""); -static_assert(!std::is_move_constructible{}, ""); -static_assert(!std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(!std::is_default_constructible{}); +static_assert(!std::is_copy_constructible{}); +static_assert(!std::is_copy_assignable{}); +static_assert(!std::is_move_constructible{}); +static_assert(!std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(!std::is_default_constructible{}, ""); -static_assert(!std::is_copy_constructible{}, ""); -static_assert(!std::is_copy_assignable{}, ""); -static_assert(!std::is_move_constructible{}, ""); -static_assert(!std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(!std::is_default_constructible{}); +static_assert(!std::is_copy_constructible{}); +static_assert(!std::is_copy_assignable{}); +static_assert(!std::is_move_constructible{}); +static_assert(!std::is_move_assignable{}); -static_assert(std::is_nothrow_destructible{}, ""); -static_assert(!std::is_default_constructible{}, ""); -static_assert(!std::is_copy_constructible{}, ""); -static_assert(!std::is_copy_assignable{}, ""); -static_assert(!std::is_move_constructible{}, ""); -static_assert(!std::is_move_assignable{}, ""); +static_assert(std::is_nothrow_destructible{}); +static_assert(!std::is_default_constructible{}); +static_assert(!std::is_copy_constructible{}); +static_assert(!std::is_copy_assignable{}); +static_assert(!std::is_move_constructible{}); +static_assert(!std::is_move_assignable{}); #endif inline bool diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp index 7e57302d23..5d1020d296 100644 --- a/src/xrpld/app/misc/detail/TxQ.cpp +++ b/src/xrpld/app/misc/detail/TxQ.cpp @@ -228,11 +228,11 @@ static_assert(sumOfFirstSquares(1).second == 1); static_assert(sumOfFirstSquares(2).first); static_assert(sumOfFirstSquares(2).second == 5); -static_assert(sumOfFirstSquares(0x1FFFFF).first, ""); -static_assert(sumOfFirstSquares(0x1FFFFF).second == 0x2AAAA8AAAAB00000ul, ""); +static_assert(sumOfFirstSquares(0x1FFFFF).first); +static_assert(sumOfFirstSquares(0x1FFFFF).second == 0x2AAAA8AAAAB00000ul); -static_assert(!sumOfFirstSquares(0x200000).first, ""); -static_assert(sumOfFirstSquares(0x200000).second == std::numeric_limits::max(), ""); +static_assert(!sumOfFirstSquares(0x200000).first); +static_assert(sumOfFirstSquares(0x200000).second == std::numeric_limits::max()); } // namespace detail