- Cleanups: My evil plot of making ex::bp private may finally be carried

[ginac.git] / ginac / wildcard.cpp

diff --git a/ginac/wildcard.cpp b/ginac/wildcard.cpp
index 5d88146f1b76d763c9f94e6dfd44e6a5c0d96b5d..f203c5f09d8d56b1ab5d5f6d8e8c667a5105644d 100644 (file)
--- a/ginac/wildcard.cpp
+++ b/ginac/wildcard.cpp
@@ -82,7 +82,7 @@ DEFAULT_UNARCHIVE(wildcard)
 
 int wildcard::compare_same_type(const basic & other) const
 {
-       GINAC_ASSERT(is_of_type(other, wildcard));
+       GINAC_ASSERT(is_a<wildcard>(other));
        const wildcard &o = static_cast<const wildcard &>(other);
 
        if (label == o.label)
@@ -95,7 +95,7 @@ void wildcard::print(const print_context & c, unsigned level) const
 {
        debugmsg("wildcard print", LOGLEVEL_PRINT);
 
-       if (is_of_type(c, print_tree)) {
+       if (is_a<print_tree>(c)) {
                c.s << std::string(level, ' ') << class_name() << " (" << label << ")"
                    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
                    << std::endl;
@@ -118,7 +118,7 @@ bool wildcard::match(const ex & pattern, lst & repl_lst) const
        // Wildcards must match each other exactly (this is required for
        // subs() to work properly because in the final step it substitutes
        // all wildcards by their matching expressions)
-       return is_equal(*pattern.bp);
+       return is_equal(ex_to<basic>(pattern));
 }
 
 } // namespace GiNaC