diff --git a/BeastConfig.h b/BeastConfig.h index 1d98e6f375..96c801dc55 100644 --- a/BeastConfig.h +++ b/BeastConfig.h @@ -58,15 +58,6 @@ //#define BEAST_CHECK_MEMORY_LEAKS 0 #endif -/** Config: BEAST_DISABLE_CONTRACT_CHECKS - Set this to 1 to prevent check_contract macros from evaluating their - conditions, which might be expensive. meet_contract macros will still - evaluate their conditions since their return values are checked. -*/ -#ifndef BEAST_DISABLE_CONTRACT_CHECKS -//#define BEAST_DISABLE_CONTRACT_CHECKS 1 -#endif - /** Config: BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES Setting this option makes Socket-derived classes generate compile errors if they forget any of the virtual overrides As some Socket-derived classes diff --git a/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h b/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h index 1070cd583c..275464fd8b 100644 --- a/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h +++ b/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h @@ -71,15 +71,6 @@ //#define BEAST_CHECK_MEMORY_LEAKS 0 #endif -/** Config: BEAST_DISABLE_CONTRACT_CHECKS - Set this to 1 to prevent check_contract macros from evaluating their - conditions, which might be expensive. meet_contract macros will still - evaluate their conditions since their return values are checked. -*/ -#ifndef BEAST_DISABLE_CONTRACT_CHECKS -//#define BEAST_DISABLE_CONTRACT_CHECKS 1 -#endif - /** Config: BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES Setting this option makes Socket-derived classes generate compile errors if they forget any of the virtual overrides As some Socket-derived classes diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp index f3a13aaf54..393e744327 100644 --- a/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp +++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_FatalError.cpp @@ -130,7 +130,7 @@ public: // We don't really expect the program to run after this // but the unit test is here so you can manually test it. int shouldBeZero (1); - fatal_assert (shouldBeZero == 0); + check_invariant (shouldBeZero == 0); } };