X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fclifford.h;h=80c13422f578134ae5b0bbc1e49baa5b1fcac23f;hp=36a1ff9bf3d0e1c46b7647aec49e24d6abaa42e7;hb=6701cf9e41629bb7a02b0800fa56bcffba1aae15;hpb=487e5659efe401683eee0381b0d23f967ffffc3c

diff --git a/ginac/clifford.h b/ginac/clifford.h
index 36a1ff9b..80c13422 100644
--- a/ginac/clifford.h
+++ b/ginac/clifford.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's clifford objects. */
 
 /*
- *  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
@@ -24,67 +24,76 @@
 #define __GINAC_CLIFFORD_H__
 
 #include <string>
-#include <ginac/indexed.h>
+#include "indexed.h"
+#include "ex.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Base class for clifford object */
 class clifford : public indexed
 {
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	// default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    clifford();
-    ~clifford();
-    clifford(clifford const & other);
-    clifford const & operator=(clifford const & other);
+	clifford();
+	~clifford();
+	clifford(const clifford & other);
+	const clifford & operator=(const clifford & other);
 protected:
-    void copy(clifford const & other); 
-    void destroy(bool call_parent);
+	void copy(const clifford & other); 
+	void destroy(bool call_parent);
 
-    // other constructors
+	// other constructors
 public:
-    explicit clifford(string const & initname);
+	explicit clifford(const std::string & initname);
 
-    // functions overriding virtual functions from base classes
+	// functions overriding virtual functions from base classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
-    bool info(unsigned inf) const;
+	basic * duplicate() const;
+	void printraw(std::ostream & os) const;
+	void printtree(std::ostream & os, unsigned indent) const;
+	void print(std::ostream & os, unsigned upper_precedence=0) const;
+	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+	bool info(unsigned inf) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    ex simplify_ncmul(exvector const & v) const;
-    unsigned calchash(void) const;
-
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
+	int compare_same_type(const basic & other) const;
+	ex simplify_ncmul(const exvector & v) const;
+	unsigned calchash(void) const;
+
+	// new virtual functions which can be overridden by derived classes
+	// none
+	
+	// non-virtual functions in this class
 public:
-    void setname(string const & n);
+	void setname(const std::string & n);
 private:
-    string & autoname_prefix(void);
+	std::string & autoname_prefix(void);
 
 // member variables
 
 protected:
-    string name;
-    unsigned serial; // unique serial number for comparision
+	std::string name;
+	unsigned serial; // unique serial number for comparision
 private:
-    static unsigned next_serial;
+	static unsigned next_serial;
 };
 
 // global constants
 
 extern const clifford some_clifford;
-extern type_info const & typeid_clifford;
+extern const std::type_info & typeid_clifford;
 
-// macros
+// utility functions
+inline const clifford &ex_to_clifford(const ex &e)
+{
+	return static_cast<const clifford &>(*e.bp);
+}
 
-#define ex_to_clifford(X) static_cast<clifford const &>(*(X).bp)
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CLIFFORD_H__
-
-