diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-06-26 18:59:16 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-06-26 18:59:16 +0800 |
| commit | fb73be737f51e4737dbd7cbe4350590cbbff8c55 (patch) | |
| tree | 6076ec5424ba49a3d49d00434d65f888dd3d8c99 /TestHelper.h | |
| parent | fed25986f2e043ed9ccc1c12c998d70846962525 (diff) | |
| parent | e4a1a5446b2a835b2fc528dcf4dfbb2c27acf12e (diff) | |
| download | dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar.gz dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar.bz2 dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar.lz dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar.xz dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.tar.zst dexon-solidity-fb73be737f51e4737dbd7cbe4350590cbbff8c55.zip | |
Merge branch 'develop' into netFix
Conflicts:
libp2p/Session.cpp
Diffstat (limited to 'TestHelper.h')
| -rw-r--r-- | TestHelper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TestHelper.h b/TestHelper.h index c21429ef..1c1dfb5f 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -32,21 +32,21 @@ #include <libtestutils/Common.h> #ifdef NOBOOST - #define TBOOST_THROW_EXCEPTION(arg) throw dev::Exception(); #define TBOOST_REQUIRE(arg) if(arg == false) throw dev::Exception(); #define TBOOST_REQUIRE_EQUAL(arg1, arg2) if(arg1 != arg2) throw dev::Exception(); #define TBOOST_CHECK_EQUAL(arg1, arg2) if(arg1 != arg2) throw dev::Exception(); #define TBOOST_CHECK(arg) if(arg == false) throw dev::Exception(); + #define TBOOST_REQUIRE_MESSAGE(arg1, arg2) if(arg1 == false) throw dev::Exception(); #define TBOOST_CHECK_MESSAGE(arg1, arg2) if(arg1 == false) throw dev::Exception(); #define TBOOST_WARN_MESSAGE(arg1, arg2) throw dev::Exception(); #define TBOOST_ERROR(arg) throw dev::Exception(); #else - #define TBOOST_THROW_EXCEPTION(arg) BOOST_THROW_EXCEPTION(arg) #define TBOOST_REQUIRE(arg) BOOST_REQUIRE(arg) #define TBOOST_REQUIRE_EQUAL(arg1, arg2) BOOST_REQUIRE_EQUAL(arg1, arg2) #define TBOOST_CHECK(arg) BOOST_CHECK(arg) #define TBOOST_CHECK_EQUAL(arg1, arg2) BOOST_CHECK_EQUAL(arg1, arg2) #define TBOOST_CHECK_MESSAGE(arg1, arg2) BOOST_CHECK_MESSAGE(arg1, arg2) + #define TBOOST_REQUIRE_MESSAGE(arg1, arg2) BOOST_REQUIRE_MESSAGE(arg1, arg2) #define TBOOST_WARN_MESSAGE(arg1, arg2) BOOST_WARN_MESSAGE(arg1, arg2) #define TBOOST_ERROR(arg) BOOST_ERROR(arg) #endif @@ -224,7 +224,7 @@ public: bool bigData = false; bool wallet = false; bool nonetwork = false; - bool nodag = false; + bool nodag = true; /// @} /// Get reference to options |