#ifndef around namespace GiNaC { }

[ginac.git] / ginac / relational.cpp

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 252d8b350660360abfdaaa022019388c67aa53e8..76bd7da2eb2a9ecfefae7abdcf67b675cb370a53 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -2,9 +2,33 @@
  *
  *  Implementation of relations between expressions */
 
+/*
+ *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdexcept>
 
-#include "ginac.h"
+#include "relational.h"
+#include "numeric.h"
+#include "debugmsg.h"
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -12,7 +36,7 @@
 
 // public
 
-relational::relational() : basic(TINFO_RELATIONAL)
+relational::relational() : basic(TINFO_relational)
 {
     debugmsg("relational default constructor",LOGLEVEL_CONSTRUCT);
 }
@@ -60,7 +84,7 @@ void relational::destroy(bool call_parent)
 
 // public
 
-relational::relational(ex const & lhs, ex const & rhs, operators oper) : basic(TINFO_RELATIONAL)
+relational::relational(ex const & lhs, ex const & rhs, operators oper) : basic(TINFO_relational)
 {
     debugmsg("relational constructor ex,ex,operator",LOGLEVEL_CONSTRUCT);
     lh=lhs;
@@ -108,8 +132,8 @@ int relational::nops() const
 
 ex & relational::let_op(int const i)
 {
-    ASSERT(i>=0);
-    ASSERT(i<2);
+    GINAC_ASSERT(i>=0);
+    GINAC_ASSERT(i<2);
 
     return i==0 ? lh : rh;
 }
@@ -148,7 +172,7 @@ ex relational::simplify_ncmul(exvector const & v) const
 
 int relational::compare_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, relational));
+    GINAC_ASSERT(is_exactly_of_type(other, relational));
     relational const & oth=static_cast<relational const &>(const_cast<basic &>(other));
     
     int cmpval;
@@ -170,13 +194,13 @@ int relational::compare_same_type(basic const & other) const
 
 unsigned relational::return_type(void) const
 {
-    ASSERT(lh.return_type()==rh.return_type());
+    GINAC_ASSERT(lh.return_type()==rh.return_type());
     return lh.return_type();
 }
    
 unsigned relational::return_type_tinfo(void) const
 {
-    ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
+    GINAC_ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
     return lh.return_type_tinfo();
 }
 
@@ -242,3 +266,6 @@ unsigned relational::precedence=20;
 const relational some_relational;
 type_info const & typeid_relational=typeid(some_relational);
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE