Changed name of debugging macro (to avoid warning cause by multiple definition).
authorJens Vollinga <jensv@balin.nikhef.nl>
Fri, 6 Feb 2009 15:24:58 +0000 (16:24 +0100)
committerJens Vollinga <jensv@balin.nikhef.nl>
Fri, 6 Feb 2009 15:24:58 +0000 (16:24 +0100)
check/error_report.h
check/match_bug.cpp
check/time_uvar_gcd.cpp

index 759d905..6698925 100644 (file)
@@ -27,7 +27,7 @@
 #include <sstream>
 #include <stdexcept>
 
 #include <sstream>
 #include <stdexcept>
 
-#define bug_on(cond, what)                             \
+#define cbug_on(cond, what)                            \
 do {                                                   \
 if (cond) {                                            \
        std::ostringstream err_stream;                  \
 do {                                                   \
 if (cond) {                                            \
        std::ostringstream err_stream;                  \
index 768e95b..11bfc56 100644 (file)
@@ -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);
        // 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);
 }
 
                "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);
        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);
 }
 
                        << pattern);
 }
 
index 79acd12..c65c515 100644 (file)
@@ -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);
 {
        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);
                "\"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;
 }
                "\"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"));
                        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 << "\", " <<
                        "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"));
        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 << "\", " <<
                        "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);
 
                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 << "\"");
                        "a = \"" << a << "\", b = \"" << b << "\", " <<
                        "old sr_gcd = \"" << g_gin << "\", " <<
                        "mod_gcd = \"" << g_check << "\"");