From 88af35502840bfc2af91aa38b061f2b185a1865d Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 6 Sep 2013 11:53:47 -0700 Subject: [PATCH] Update programming by contract macros --- Builds/VisualStudio2012/BeastConfig.h | 9 --------- modules/beast_core/diagnostic/beast_FatalError.cpp | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Builds/VisualStudio2012/BeastConfig.h b/Builds/VisualStudio2012/BeastConfig.h index 1070cd58..275464fd 100644 --- a/Builds/VisualStudio2012/BeastConfig.h +++ b/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/modules/beast_core/diagnostic/beast_FatalError.cpp b/modules/beast_core/diagnostic/beast_FatalError.cpp index f3a13aaf..393e7443 100644 --- a/modules/beast_core/diagnostic/beast_FatalError.cpp +++ b/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); } };