Changed name of debugging macro (to avoid warning cause by multiple definition).

diff --git a/check/error_report.h b/check/error_report.h
index 759d905b583dd2f26fde6fe00b7f1fd69f62b208..66989251be9fbca47bf026c7da2f299b2addf0e0 100644 (file)
--- a/check/error_report.h
+++ b/check/error_report.h
@@ -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;                  \

diff --git a/check/match_bug.cpp b/check/match_bug.cpp
index 768e95bb402e959ea97338c07ac2d259dfd0b214..11bfc5613cfe287bf6a1533a3a9a79c57a82bcd0 100644 (file)
--- 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);
        // 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);
 }
 

diff --git a/check/time_uvar_gcd.cpp b/check/time_uvar_gcd.cpp
index 79acd122c0477ccaf384f1cc14c3582754860c24..c65c515b45f72f92e50694896da1153b3a1922b2 100644 (file)
--- 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);
 {
        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 << "\"");