- Derivatives are now assembled in a slightly different manner (i.e. they

[ginac.git] / ginac / clifford.cpp

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 16f9a4d4c9822e30137f6a074de614c94dabf8e2..2bf3fbb7abac689dba46342c582655fe91932d2f 100644 (file)
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -4,7 +4,7 @@
  *  No real implementation yet, to be done.     */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  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
@@ -29,7 +29,9 @@
 #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
@@ -51,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) {
@@ -69,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;
@@ -89,7 +91,7 @@ void clifford::destroy(bool call_parent)
 
 // public
 
-clifford::clifford(string const & initname)
+clifford::clifford(const std::string & initname)
 {
     debugmsg("clifford constructor from string",LOGLEVEL_CONSTRUCT);
     name=initname;
@@ -109,7 +111,7 @@ basic * clifford::duplicate() const
     return new clifford(*this);
 }
 
-void clifford::printraw(ostream & os) const
+void clifford::printraw(std::ostream & os) const
 {
     debugmsg("clifford printraw",LOGLEVEL_PRINT);
     os << "clifford(" << "name=" << name << ",serial=" << serial
@@ -118,25 +120,26 @@ void clifford::printraw(ostream & os) const
     os << ",hash=" << hashvalue << ",flags=" << flags << ")";
 }
 
-void clifford::printtree(ostream & os, unsigned indent) const
+void clifford::printtree(std::ostream & os, unsigned indent) const
 {
     debugmsg("clifford printtree",LOGLEVEL_PRINT);
-    os << string(indent,' ') << name << " (clifford): "
+    os << std::string(indent,' ') << name << " (clifford): "
        << "serial=" << serial << ","
        << seq.size() << "indices=";
-    printtreeindices(os,indent);
-    os << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")"
-       << ", flags=" << flags << endl;
+    printtreeindices(os, indent);
+    os << ", hash=" << hashvalue
+       << " (0x" << std::hex << hashvalue << std::dec << ")"
+       << ", flags=" << flags << std::endl;
 }
 
-void clifford::print(ostream & os, unsigned upper_precedence) const
+void clifford::print(std::ostream & os, unsigned upper_precedence) const
 {
     debugmsg("clifford print",LOGLEVEL_PRINT);
     os << name;
     printindices(os);
 }
 
-void clifford::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+void clifford::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
 {
     debugmsg("clifford print csrc",LOGLEVEL_PRINT);
     print(os,upper_precedence);
@@ -149,7 +152,7 @@ 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
 {
     GINAC_ASSERT(other.tinfo() == TINFO_clifford);
     const clifford *o = static_cast<const clifford *>(&other);
@@ -159,7 +162,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);
 }
@@ -183,16 +186,16 @@ unsigned clifford::calchash(void) const
 // non-virtual functions in this class
 //////////
 
-void clifford::setname(string const & n)
+void clifford::setname(const std::string & n)
 {
-    name=n;
+    name = n;
 }
 
 // private
 
-string & clifford::autoname_prefix(void)
+std::string & clifford::autoname_prefix(void)
 {
-    static string * s=new string("clifford");
+    static std::string * s = new std::string("clifford");
     return *s;
 }
 
@@ -209,6 +212,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