#ifndef around namespace GiNaC { }

[ginac.git] / ginac / symbol.cpp

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 2d42b5af8047055e5d005df9431258de7046e0fd..1bea2cec954698bc3751b8bbdd51efaee2ac8665 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -29,7 +29,9 @@
 #include "idx.h"
 #include "debugmsg.h"
 
 #include "idx.h"
 #include "debugmsg.h"
 

+#ifndef NO_GINAC_NAMESPACE

 namespace GiNaC {
 namespace GiNaC {

+#endif // ndef NO_GINAC_NAMESPACE

 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers


@@ -168,13 +170,13 @@ ex symbol::eval(int level) const
 
 ex symbol::subs(lst const & ls, lst const & lr) const
 {
 
 ex symbol::subs(lst const & ls, lst const & lr) const
 {

-    ASSERT(ls.nops()==lr.nops());
-#ifdef DOASSERT
+    GINAC_ASSERT(ls.nops()==lr.nops());
+#ifdef DO_GINAC_ASSERT

     for (int i=0; i<ls.nops(); i++) {
     for (int i=0; i<ls.nops(); i++) {

-        ASSERT(is_ex_exactly_of_type(ls.op(i),symbol)||
+        GINAC_ASSERT(is_ex_exactly_of_type(ls.op(i),symbol)||

                is_ex_of_type(ls.op(i),idx));
     }
                is_ex_of_type(ls.op(i),idx));
     }

-#endif // def DOASSERT
+#endif // def DO_GINAC_ASSERT

 
     for (int i=0; i<ls.nops(); i++) {
         if (is_ex_exactly_of_type(ls.op(i),symbol)) {
 
     for (int i=0; i<ls.nops(); i++) {
         if (is_ex_exactly_of_type(ls.op(i),symbol)) {


@@ -188,7 +190,7 @@ ex symbol::subs(lst const & ls, lst const & lr) const
 
 int symbol::compare_same_type(basic const & other) const
 {
 
 int symbol::compare_same_type(basic const & other) const
 {

-    ASSERT(is_of_type(other,symbol));
+    GINAC_ASSERT(is_of_type(other,symbol));

     const symbol *o = static_cast<const symbol *>(&other);
     if (serial==o->serial) return 0;
     return serial < o->serial ? -1 : 1;
     const symbol *o = static_cast<const symbol *>(&other);
     if (serial==o->serial) return 0;
     return serial < o->serial ? -1 : 1;


@@ -196,7 +198,7 @@ int symbol::compare_same_type(basic const & other) const
 
 bool symbol::is_equal_same_type(basic const & other) const
 {
 
 bool symbol::is_equal_same_type(basic const & other) const
 {

-    ASSERT(is_of_type(other,symbol));
+    GINAC_ASSERT(is_of_type(other,symbol));

     const symbol *o = static_cast<const symbol *>(&other);
     return serial==o->serial;
 }
     const symbol *o = static_cast<const symbol *>(&other);
     return serial==o->serial;
 }


@@ -281,4 +283,6 @@ symbol::assigned_ex_info::assigned_ex_info(void) : is_assigned(0), refcount(1)
 {
 }
 
 {
 }
 

+#ifndef NO_GINAC_NAMESPACE

 } // namespace GiNaC
 } // namespace GiNaC

+#endif // ndef NO_GINAC_NAMESPACE