diff options
| -rw-r--r-- | src/system.hh.in | 23 | ||||
| -rw-r--r-- | src/utils.h | 25 |
2 files changed, 23 insertions, 25 deletions
diff --git a/src/system.hh.in b/src/system.hh.in index 35253962..52c8a706 100644 --- a/src/system.hh.in +++ b/src/system.hh.in @@ -73,6 +73,29 @@ #cmakedefine01 DEBUG_MODE #cmakedefine01 NO_ASSERTS +/** + * @name Default values + */ +/*@{*/ + +#if DEBUG_MODE +#define DEBUG_ON 1 +#define VERIFY_ON 1 +#define TRACING_ON 1 +#elif NO_ASSERTS +#define DEBUG_ON 0 +#define VERIFY_ON 0 +#define TRACING_ON 0 +#else +#define DEBUG_ON 0 +#define VERIFY_ON 0 +#define TRACING_ON 1 // use --trace X to enable +#endif + +#define LOGGING_ON 1 + +/*@}*/ + #define DOCUMENT_MODEL 0 #define REDUCE_TO_INTEGER 0 diff --git a/src/utils.h b/src/utils.h index 7ca5935a..a3fc9de5 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,30 +45,8 @@ #include <boost/uuid/detail/sha1.hpp> -/** - * @name Default values - */ -/*@{*/ - #define TIMERS_ON 1 -#if DEBUG_MODE -#define DEBUG_ON 1 -#define VERIFY_ON 1 -#define TRACING_ON 1 -#elif NO_ASSERTS -#define DEBUG_ON 0 -#define VERIFY_ON 0 -#define TRACING_ON 0 -//#define NO_LOGGING 1 -#else -#define DEBUG_ON 0 -#define VERIFY_ON 0 -#define TRACING_ON 1 // use --trace X to enable -#endif - -/*@}*/ - /** * @name Forward declarations */ @@ -217,9 +195,6 @@ inline string operator+(const char * left, const string& right) { */ /*@{*/ -#if ! defined(NO_LOGGING) -#define LOGGING_ON 1 -#endif #if LOGGING_ON namespace ledger { |