* New funny timing added: compute an antipode in Yukawa theory.

[ginac.git] / ginac / isospin.h

diff --git a/ginac/isospin.h b/ginac/isospin.h
index 0cc29bc71d297bf2d363f0425de58d1ea63cfb6d..925ef63b9c3e83dec2245844cdb60090b989b666 100644 (file)
--- a/ginac/isospin.h
+++ b/ginac/isospin.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's isospin objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -26,75 +26,52 @@
 #include <string>
 #include "indexed.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Base class for isospin object */
 class isospin : public indexed
 {
-    GINAC_DECLARE_REGISTERED_CLASS(isospin, indexed)
+       GINAC_DECLARE_REGISTERED_CLASS(isospin, indexed)
 
-// member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-    isospin();
-    ~isospin();
-    isospin(const isospin & other);
-    const isospin & operator=(const isospin & other);
-protected:
-    void copy(const isospin & other); 
-    void destroy(bool call_parent);
-
-    // other constructors
+       // other constructors
 public:
-    explicit isospin(const string & initname);
+       explicit isospin(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;
+       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(const basic & other) const;
-    ex simplify_ncmul(const exvector & v) const;
-    unsigned calchash(void) 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
+       // new virtual functions which can be overridden by derived classes
+       // none
+       
+       // non-virtual functions in this class
 public:
-    void setname(const string & 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 isospin some_isospin;
-extern const type_info & typeid_isospin;
-
 // utility functions
 inline const isospin &ex_to_isospin(const ex &e)
 {
        return static_cast<const isospin &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ISOSPIN_H__