- The status_flags::expanded is now used on some occasions.

[ginac.git] / ginac / isospin.h

diff --git a/ginac/isospin.h b/ginac/isospin.h
index 56ae1b7920e414fbdc3aff65f5106f3d407b43bc..0cc29bc71d297bf2d363f0425de58d1ea63cfb6d 100644 (file)
--- a/ginac/isospin.h
+++ b/ginac/isospin.h
@@ -1,8 +1,9 @@
 /** @file isospin.h
  *
- *  Interface to GiNaC's isospin objects.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to GiNaC's isospin objects. */
+
+/*
+ *  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
@@ -23,25 +24,32 @@
 #define __GINAC_ISOSPIN_H__
 
 #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)
+
 // member functions
 
     // default constructor, destructor, copy constructor assignment operator and helpers
 public:
     isospin();
     ~isospin();
-    isospin(isospin const & other);
-    isospin const & operator=(isospin const & other);
+    isospin(const isospin & other);
+    const isospin & operator=(const isospin & other);
 protected:
-    void copy(isospin const & other); 
+    void copy(const isospin & other); 
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    explicit isospin(string const & initname);
+    explicit isospin(const string & initname);
 
     // functions overriding virtual functions from base classes
 public:
@@ -52,8 +60,8 @@ public:
     void printcsrc(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;
+    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
@@ -61,7 +69,7 @@ protected:
     
     // non-virtual functions in this class
 public:
-    void setname(string const & n);
+    void setname(const string & n);
 private:
     string & autoname_prefix(void);
 
@@ -77,12 +85,16 @@ private:
 // global constants
 
 extern const isospin some_isospin;
-extern type_info const & typeid_isospin;
+extern const type_info & typeid_isospin;
 
-// macros
+// utility functions
+inline const isospin &ex_to_isospin(const ex &e)
+{
+       return static_cast<const isospin &>(*e.bp);
+}
 
-#define ex_to_isospin(X) static_cast<isospin const &>(*(X).bp)
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ISOSPIN_H__
-
-