From a30e0f4be08d5d188f037af184fc75b6d3e62ba0 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Mon, 29 Aug 2011 14:32:30 +1000 Subject: [PATCH] Change debug temporary names to reduce collisions --- debug.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debug.hpp b/debug.hpp index 00b3d576..732bc3b4 100644 --- a/debug.hpp +++ b/debug.hpp @@ -34,28 +34,28 @@ #define verify_soft(C, COND) ({ \ - const auto value = (C); \ - check_soft(value COND); \ - value; \ + const auto __DEBUG_value = (C); \ + check_soft(__DEBUG_value COND); \ + __DEBUG_value; \ }) -#define verify_hard(C, COND) ({ \ - const auto value = (C); \ - check_hard(value COND); \ - value; \ +#define verify_hard(C, COND) ({ \ + const auto __DEBUG_value = (C); \ + check_hard(__DEBUG_value COND); \ + __DEBUG_value; \ }) #define _check_meta(C, SUCCESS, FAILURE) do { \ - const auto value = (C); \ - if (unlikely (!value)) { \ + const auto __DEBUG_value = (C); \ + if (unlikely (!__DEBUG_value)) { \ std::cerr << PACKAGE << ": " \ << __FILE__ << ":" \ << __LINE__ << ": " \ << __FUNCTION__ \ << ". Assertion '" << #C \ - << "' failed with: " << value << std::endl; \ + << "' failed: " << __DEBUG_value << std::endl; \ \ { FAILURE } \ } else { \