diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-07-11 15:06:51 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-11 15:02:07 +0200 |
commit | fa5363538125d996ae5cede55f7f05e88701ace2 (patch) | |
tree | 06fa703f68df37e0ae4697b6c4bcd631791471c7 /src | |
parent | 5f96bce9b7f38c687817d58e8b54a5b7ebfe91b3 (diff) | |
download | bitcoin-fa5363538125d996ae5cede55f7f05e88701ace2.tar.xz |
util: Make Assert work with any value
Diffstat (limited to 'src')
-rw-r--r-- | src/test/util_tests.cpp | 10 | ||||
-rw-r--r-- | src/util/check.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 257328974b..e247c09a97 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -41,6 +41,16 @@ namespace BCLog { BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup) +BOOST_AUTO_TEST_CASE(util_check) +{ + // Check that Assert can forward + const std::unique_ptr<int> p_two = Assert(MakeUnique<int>(2)); + // Check that Assert works on lvalues and rvalues + const int two = *Assert(p_two); + Assert(two == 2); + Assert(true); +} + BOOST_AUTO_TEST_CASE(util_criticalsection) { RecursiveMutex cs; diff --git a/src/util/check.h b/src/util/check.h index 3d534fd33e..9edf394492 100644 --- a/src/util/check.h +++ b/src/util/check.h @@ -54,6 +54,6 @@ T get_pure_r_value(T&& val) } /** Identity function. Abort if the value compares equal to zero */ -#define Assert(val) [&]() -> decltype(get_pure_r_value(val))& { auto& check = (val); assert(#val && check); return check; }() +#define Assert(val) [&]() -> decltype(get_pure_r_value(val)) { auto&& check = (val); assert(#val && check); return std::forward<decltype(get_pure_r_value(val))>(check); }() #endif // BITCOIN_UTIL_CHECK_H |