- building GiNaC will no longer bomb if Doxygen is not present

[ginac.git] / ginac / exprseq.cpp

diff --git a/ginac/exprseq.cpp b/ginac/exprseq.cpp
index ad200a4690ca40d0b57b0faa15de73a7c7e1bf7b..2ba3370c1a416a9979bb7cb9d8d5813ac37851c9 100644 (file)
--- a/ginac/exprseq.cpp
+++ b/ginac/exprseq.cpp
@@ -1,6 +1,8 @@
 /** @file exprseq.cpp
  *
- *  Implementation of GiNaC's exprseq. 
+ *  Implementation of GiNaC's exprseq. */
+
+/*
  *  This file was generated automatically by container.pl.
  *  Please do not modify it directly, edit the perl script instead!
  *  container.pl options: $CONTAINER=exprseq
@@ -31,7 +33,11 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "ginac.h"
+#include "exprseq.h"
+#include "ex.h"
+#include "debugmsg.h"
+
+namespace GiNaC {
 
 #define RESERVE(s,size) (s).reserve(size)
 
@@ -41,7 +47,7 @@
 
 // public
 
-exprseq::exprseq() : basic(TINFO_EXPRSEQ)
+exprseq::exprseq() : basic(TINFO_exprseq)
 {
     debugmsg("exprseq default constructor",LOGLEVEL_CONSTRUCT);
 }
@@ -88,7 +94,7 @@ void exprseq::destroy(bool call_parent)
 
 // public
 
-exprseq::exprseq(exvector const & s, bool discardable) :  basic(TINFO_EXPRSEQ)
+exprseq::exprseq(exvector const & s, bool discardable) :  basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from exvector",
              LOGLEVEL_CONSTRUCT);
@@ -99,15 +105,15 @@ exprseq::exprseq(exvector const & s, bool discardable) :  basic(TINFO_EXPRSEQ)
     }
 }
 
-exprseq::exprseq(exvector * vp) : basic(TINFO_EXPRSEQ)
+exprseq::exprseq(exvector * vp) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from exvector *",LOGLEVEL_CONSTRUCT);
-    ASSERT(vp!=0);
+    GINAC_ASSERT(vp!=0);
     seq.swap(*vp);
     delete vp;
 }
 
-exprseq::exprseq(ex const & e1) :  basic(TINFO_EXPRSEQ)
+exprseq::exprseq(ex const & e1) :  basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 1 ex",
              LOGLEVEL_CONSTRUCT);
@@ -115,7 +121,7 @@ exprseq::exprseq(ex const & e1) :  basic(TINFO_EXPRSEQ)
     seq.push_back(e1);
 }
 
-exprseq::exprseq(ex const & e1, ex const & e2) : basic(TINFO_EXPRSEQ)
+exprseq::exprseq(ex const & e1, ex const & e2) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 2 ex",
              LOGLEVEL_CONSTRUCT);
@@ -125,7 +131,7 @@ exprseq::exprseq(ex const & e1, ex const & e2) : basic(TINFO_EXPRSEQ)
 }
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3)
-    : basic(TINFO_EXPRSEQ)
+    : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 3 ex",
              LOGLEVEL_CONSTRUCT);
@@ -136,7 +142,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3)
 }
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
-                     ex const & e4) : basic(TINFO_EXPRSEQ)
+                     ex const & e4) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 4 ex",
              LOGLEVEL_CONSTRUCT);
@@ -148,7 +154,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
 }
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
-                     ex const & e4, ex const & e5) : basic(TINFO_EXPRSEQ)
+                     ex const & e4, ex const & e5) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 5 ex",
              LOGLEVEL_CONSTRUCT);
@@ -162,7 +168,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
                      ex const & e4, ex const & e5, ex const & e6)
-    : basic(TINFO_EXPRSEQ)
+    : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 6 ex",
              LOGLEVEL_CONSTRUCT);
@@ -177,7 +183,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
                      ex const & e4, ex const & e5, ex const & e6,
-                     ex const & e7) : basic(TINFO_EXPRSEQ)
+                     ex const & e7) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 7 ex",
              LOGLEVEL_CONSTRUCT);
@@ -193,7 +199,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
 
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
                      ex const & e4, ex const & e5, ex const & e6,
-                     ex const & e7, ex const & e8) : basic(TINFO_EXPRSEQ)
+                     ex const & e7, ex const & e8) : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 8 ex",
              LOGLEVEL_CONSTRUCT);
@@ -211,7 +217,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
 exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
                      ex const & e4, ex const & e5, ex const & e6,
                      ex const & e7, ex const & e8, ex const & e9)
-    : basic(TINFO_EXPRSEQ)
+    : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 9 ex",
              LOGLEVEL_CONSTRUCT);
@@ -231,7 +237,7 @@ exprseq::exprseq(ex const & e1, ex const & e2, ex const & e3,
                      ex const & e4, ex const & e5, ex const & e6,
                      ex const & e7, ex const & e8, ex const & e9,
                      ex const &e10)
-    : basic(TINFO_EXPRSEQ)
+    : basic(TINFO_exprseq)
 {
     debugmsg("exprseq constructor from 10 ex",
              LOGLEVEL_CONSTRUCT);
@@ -317,7 +323,7 @@ ex exprseq::expand(unsigned options) const
 
 bool exprseq::has(ex const & other) const
 {
-    ASSERT(other.bp!=0);
+    GINAC_ASSERT(other.bp!=0);
     if (is_equal(*other.bp)) return true;
     for (exvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
         if ((*it).has(other)) return true;
@@ -365,7 +371,7 @@ ex exprseq::subs(lst const & ls, lst const & lr) const
 
 int exprseq::compare_same_type(basic const & other) const
 {
-    ASSERT(is_of_type(other,exprseq));
+    GINAC_ASSERT(is_of_type(other,exprseq));
     exprseq const & o=static_cast<exprseq const &>
                                     (const_cast<basic &>(other));
     int cmpval;
@@ -386,7 +392,7 @@ int exprseq::compare_same_type(basic const & other) const
 
 bool exprseq::is_equal_same_type(basic const & other) const
 {
-    ASSERT(is_of_type(other,exprseq));
+    GINAC_ASSERT(is_of_type(other,exprseq));
     exprseq const & o=static_cast<exprseq const &>
                                     (const_cast<basic &>(other));
     if (seq.size()!=o.seq.size()) return false;
@@ -609,3 +615,5 @@ unsigned exprseq::precedence=10;
 const exprseq some_exprseq;
 type_info const & typeid_exprseq=typeid(some_exprseq);
 
+} // namespace GiNaC
+