From 00e8b059ea0ecd4a945657eabed17293dc73024a Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Wed, 7 Sep 2016 17:39:49 +0200 Subject: Explicitly convert the assert condition using bool() This allows a shared pointer as a condition because bool(std::shared_ptr) is defined. --- libdevcore/Assertions.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'libdevcore') diff --git a/libdevcore/Assertions.h b/libdevcore/Assertions.h index 7b4a4a76..05e0b0e5 100644 --- a/libdevcore/Assertions.h +++ b/libdevcore/Assertions.h @@ -73,7 +73,7 @@ inline bool assertEqualAux(A const& _a, B const& _b, char const* _aStr, char con /// Use it as assertThrow(1 == 1, ExceptionType, "Mathematics is wrong."); /// Do NOT supply an exception object as the second parameter. #define assertThrow(_condition, _ExceptionType, _description) \ - ::dev::assertThrowAux<_ExceptionType>(_condition, _description, __LINE__, __FILE__, ETH_FUNC) + ::dev::assertThrowAux<_ExceptionType>(!!(_condition), _description, __LINE__, __FILE__, ETH_FUNC) using errinfo_comment = boost::error_info; @@ -96,16 +96,4 @@ inline void assertThrowAux( ); } -template -inline void assertThrowAux( - void const* _pointer, - ::std::string const& _errorDescription, - unsigned _line, - char const* _file, - char const* _function -) -{ - assertThrowAux<_ExceptionType>(_pointer != nullptr, _errorDescription, _line, _file, _function); -} - } -- cgit v1.2.3