- Renamed flag NO_GINAC_NAMESPACE to NO_NAMESPACE_GINAC because of m4.

[ginac.git] / ginac / clifford.cpp

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 9c01f9a0002dae884990e4801610df4954950fb1..65d3584c9ee719012940843d9f2d7580e102ea59 100644 (file)
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -1,9 +1,10 @@
 /** @file clifford.cpp
  *
  *  Implementation of GiNaC's clifford objects.
- *  No real implementation yet, to be done.    
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  No real implementation yet, to be done.     */
+
+/*
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -22,8 +23,15 @@
 
 #include <string>
 
-#include "ginac.h"
+#include "clifford.h"
+#include "ex.h"
+#include "ncmul.h"
 #include "utils.h"
+#include "debugmsg.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -36,7 +44,7 @@ clifford::clifford()
     debugmsg("clifford default constructor",LOGLEVEL_CONSTRUCT);
     serial=next_serial++;
     name=autoname_prefix()+ToString(serial);
-    tinfo_key=TINFO_CLIFFORD;
+    tinfo_key=TINFO_clifford;
 }
 
 clifford::~clifford()
@@ -45,13 +53,13 @@ clifford::~clifford()
     destroy(0);
 }
 
-clifford::clifford(clifford const & other)
+clifford::clifford(const clifford & other)
 {
     debugmsg("clifford copy constructor",LOGLEVEL_CONSTRUCT);
     copy (other);
 }
 
-clifford const & clifford::operator=(clifford const & other)
+const clifford & clifford::operator=(const clifford & other)
 {
     debugmsg("clifford operator=",LOGLEVEL_ASSIGNMENT);
     if (this != &other) {
@@ -63,7 +71,7 @@ clifford const & clifford::operator=(clifford const & other)
 
 // protected
 
-void clifford::copy(clifford const & other)
+void clifford::copy(const clifford & other)
 {
     indexed::copy(other);
     name=other.name;
@@ -83,12 +91,12 @@ void clifford::destroy(bool call_parent)
 
 // public
 
-clifford::clifford(string const & initname)
+clifford::clifford(const string & initname)
 {
     debugmsg("clifford constructor from string",LOGLEVEL_CONSTRUCT);
     name=initname;
     serial=next_serial++;
-    tinfo_key=TINFO_CLIFFORD;
+    tinfo_key=TINFO_clifford;
 }
 
 //////////
@@ -143,9 +151,9 @@ bool clifford::info(unsigned inf) const
 
 // protected
 
-int clifford::compare_same_type(basic const & other) const
+int clifford::compare_same_type(const basic & other) const
 {
-    ASSERT(other.tinfo() == TINFO_CLIFFORD);
+    GINAC_ASSERT(other.tinfo() == TINFO_clifford);
     const clifford *o = static_cast<const clifford *>(&other);
     if (serial==o->serial) {
         return indexed::compare_same_type(other);
@@ -153,7 +161,7 @@ int clifford::compare_same_type(basic const & other) const
     return serial < o->serial ? -1 : 1;
 }
 
-ex clifford::simplify_ncmul(exvector const & v) const
+ex clifford::simplify_ncmul(const exvector & v) const
 {
     return simplified_ncmul(v);
 }
@@ -177,7 +185,7 @@ unsigned clifford::calchash(void) const
 // non-virtual functions in this class
 //////////
 
-void clifford::setname(string const & n)
+void clifford::setname(const string & n)
 {
     name=n;
 }
@@ -203,5 +211,8 @@ unsigned clifford::next_serial=0;
 //////////
 
 const clifford some_clifford;
-type_info const & typeid_clifford=typeid(some_clifford);
+const type_info & typeid_clifford=typeid(some_clifford);
 
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC