- put everything in "GiNaC" namespace

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index d22dc86a38aedeba4770a8a690e14028ff988525..0de91a17dd414f0f19549b90bd3c52553c7b22e9 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -1,7 +1,8 @@
 /** @file ex.h
  *
- *  Interface to GiNaC's light-weight expression handles.
- *
+ *  Interface to GiNaC's light-weight expression handles. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,6 +24,10 @@
 #define __GINAC_EX_H__
 
 #include <iostream>
+#include <ginac/basic.h>
+#include <ginac/operators.h>
+
+namespace GiNaC {
 
 class ex;
 class expand_options;
@@ -60,7 +65,6 @@ public:
 #ifdef INLINE_EX_CONSTRUCTORS
     : bp(exZERO().bp)
         {
-            debugmsg("ex default constructor",LOGLEVEL_CONSTRUCT);
             ASSERT(exZERO().bp!=0);
             ASSERT(exZERO().bp->flags & status_flags::dynallocated);
             ASSERT(bp!=0);
@@ -73,7 +77,6 @@ public:
     ~ex()
 #ifdef INLINE_EX_CONSTRUCTORS
         {
-            debugmsg("ex destructor",LOGLEVEL_DESTRUCT);
             ASSERT(bp!=0);
             ASSERT(bp->flags & status_flags::dynallocated);
             if (--bp->refcount == 0) {
@@ -88,7 +91,6 @@ public:
 #ifdef INLINE_EX_CONSTRUCTORS
     : bp(other.bp)
         {
-            debugmsg("ex copy constructor",LOGLEVEL_CONSTRUCT);
             ASSERT(bp!=0);
             ASSERT((bp->flags) & status_flags::dynallocated);
             ++bp->refcount;
@@ -100,7 +102,6 @@ public:
     ex const & operator=(ex const & other)
 #ifdef INLINE_EX_CONSTRUCTORS
         {
-            debugmsg("ex operator=",LOGLEVEL_ASSIGNMENT);
             ASSERT(bp!=0);
             ASSERT(bp->flags & status_flags::dynallocated);
             ASSERT(other.bp!=0);
@@ -122,7 +123,6 @@ public:
     ex(basic const & other)
 #ifdef INLINE_EX_CONSTRUCTORS
     {
-        debugmsg("ex constructor from basic",LOGLEVEL_CONSTRUCT);
         construct_from_basic(other);
     }
 #else
@@ -227,9 +227,14 @@ private:
 
 public:
     basic *bp;
-
 };
 
+// utility functions
+inline bool are_ex_trivially_equal(const ex &e1, const ex &e2)
+{
+       return e1.bp == e2.bp;
+}
+
 // wrapper functions around member functions
 inline int nops(ex const & thisex)
 { return thisex.nops(); }
@@ -279,4 +284,6 @@ inline ex subs(ex const & thisex, lst const & ls, lst const & lr)
 inline void swap(ex & e1, ex & e2)
 { e1.swap(e2); }
 
+} // namespace GiNaC
+
 #endif // ndef __GINAC_EX_H__