- Updated from FSF.

[ginac.git] / ginac / isospin.h

diff --git a/ginac/isospin.h b/ginac/isospin.h
index c4d23864ea39989c31df26c5d0776aa4b35a40fe..da77efa4a64041cbe2847d0d28369870cd891fa4 100644 (file)
--- a/ginac/isospin.h
+++ b/ginac/isospin.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's isospin 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,64 +24,68 @@
 #define __GINAC_ISOSPIN_H__
 
 #include <string>
-#include <ginac/indexed.h>
+#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)
+
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       // default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    isospin();
-    ~isospin();
-    isospin(isospin const & other);
-    isospin const & operator=(isospin const & other);
+       isospin();
+       ~isospin();
+       isospin(const isospin & other);
+       const isospin & operator=(const isospin & other);
 protected:
-    void copy(isospin const & other); 
-    void destroy(bool call_parent);
+       void copy(const isospin & other); 
+       void destroy(bool call_parent);
 
-    // other constructors
+       // other constructors
 public:
-    explicit isospin(string const & 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;
+       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 isospin some_isospin;
-extern type_info const & typeid_isospin;
+extern const type_info & typeid_isospin;
 
 // utility functions
 inline const isospin &ex_to_isospin(const ex &e)
@@ -89,6 +93,8 @@ 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__