From 2251ede3f4b3e7066f83fbedba53181c03f633f7 Mon Sep 17 00:00:00 2001 From: Jens Vollinga Date: Fri, 6 Feb 2009 16:24:58 +0100 Subject: [PATCH] Changed name of debugging macro (to avoid warning cause by multiple definition). --- check/error_report.h | 2 +- check/match_bug.cpp | 6 +++--- check/time_uvar_gcd.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/check/error_report.h b/check/error_report.h index 759d905b..66989251 100644 --- a/check/error_report.h +++ b/check/error_report.h @@ -27,7 +27,7 @@ #include #include -#define bug_on(cond, what) \ +#define cbug_on(cond, what) \ do { \ if (cond) { \ std::ostringstream err_stream; \ diff --git a/check/match_bug.cpp b/check/match_bug.cpp index 768e95bb..11bfc561 100644 --- a/check/match_bug.cpp +++ b/check/match_bug.cpp @@ -45,8 +45,8 @@ static void failed_match_have_side_effects() // obviously e does NOT match the pattern exmap repls; bool match_p = e.match(pattern, repls); - bug_on(match_p, "match(" << e << ", " << pattern << ") says \"Yes\""); - bug_on(repls.size() != 0, + cbug_on(match_p, "match(" << e << ", " << pattern << ") says \"Yes\""); + cbug_on(repls.size() != 0, "failed match have side effects: repls = " << repls); } @@ -69,7 +69,7 @@ static void match_false_negative() ex pattern = pow(wild(0), -1)*pow(x, wild(2)); exmap repls; bool match_p = e.match(pattern, repls); - bug_on(!match_p, "false negative: " << e << " did not match " + cbug_on(!match_p, "false negative: " << e << " did not match " << pattern); } diff --git a/check/time_uvar_gcd.cpp b/check/time_uvar_gcd.cpp index 79acd122..c65c515b 100644 --- a/check/time_uvar_gcd.cpp +++ b/check/time_uvar_gcd.cpp @@ -1657,11 +1657,11 @@ gcd_sanity_check(const upoly& g, const upoly& a, const upoly& b, { upoly r1, r2; remainder_in_ring(r1, a, g); - bug_on(!r1.empty(), "bug: " << label << " : gcd g = \"" << g << + cbug_on(!r1.empty(), "bug: " << label << " : gcd g = \"" << g << "\"does not divide a =\"" << a << "\""); remainder_in_ring(r2, b, g); - bug_on(!r2.empty(), "bug: " << label << " : gcd g = \"" << g << + cbug_on(!r2.empty(), "bug: " << label << " : gcd g = \"" << g << "\"does not divide b =\"" << b << "\""); return true; } @@ -1713,7 +1713,7 @@ struct heur_gcd_test return false; gcd_sanity_check(g, a, b, std::string("heur_gcd")); - bug_on(g != g_check, + cbug_on(g != g_check, "modular and heuristic GCD disagree: " << "a = \"" << a << "\", b = \"" << b << "\", " << "mod_gcd = \"" << g_check << "\", " << @@ -1756,7 +1756,7 @@ struct sr_gcd_test bool check() const { gcd_sanity_check(g, a, b, std::string("sr_gcd")); - bug_on(g != g_check, + cbug_on(g != g_check, "modular and PRS GCD disagree: " << "a = \"" << a << "\", b = \"" << b << "\", " << "mod_gcd = \"" << g_check << "\", " << @@ -1795,7 +1795,7 @@ struct ex_sr_gcd_test upoly g_gin; ex2upoly(g_gin, g); - bug_on(g_gin != g_check, "modular and old PRS GCD disagree: " << + cbug_on(g_gin != g_check, "modular and old PRS GCD disagree: " << "a = \"" << a << "\", b = \"" << b << "\", " << "old sr_gcd = \"" << g_gin << "\", " << "mod_gcd = \"" << g_check << "\""); -- 2.44.0