- A new test ripped shamelessly from the Mathematica book.

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 92e6b1ff3dfcae4d5703d20aad6c3d91d0564a9d..a8f368bbe5b83911b3f7c8b71cce32630d22fc6c 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -2,16 +2,40 @@
  *
  *  Interface to GiNaC's color indices. */
 
-#ifndef _COLORIDX_H_
-#define _COLORIDX_H_
+/*
+ *  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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __GINAC_COLORIDX_H__
+#define __GINAC_COLORIDX_H__
 
 #include <string>
 #include <vector>
-
 #include "idx.h"
+#include "ex.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 class coloridx : public idx
 {
+    GINAC_DECLARE_REGISTERED_CLASS(coloridx, idx)
+
     friend class color;
 
 // member functions
@@ -20,18 +44,18 @@ class coloridx : public idx
 public:
     coloridx();
     ~coloridx();
-    coloridx (coloridx const & other);
-    coloridx const & operator=(coloridx const & other);
+    coloridx (const coloridx & other);
+    const coloridx & operator=(const coloridx & other);
 protected:
-    void copy(coloridx const & other);
+    void copy(const coloridx & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
     explicit coloridx(bool cov);
-    explicit coloridx(string const & n, bool cov=false);
-    explicit coloridx(char const * n, bool cov=false);
-    explicit coloridx(unsigned const v, bool cov=false); 
+    explicit coloridx(const string & n, bool cov=false);
+    explicit coloridx(const char * n, bool cov=false);
+    explicit coloridx(unsigned v, bool cov=false); 
 
     // functions overriding virtual functions from bases classes
 public:
@@ -54,10 +78,16 @@ public:
 // global constants
 
 extern const coloridx some_coloridx;
-extern type_info const & typeid_coloridx;
+extern const type_info & typeid_coloridx;
 
-// macros
+// utility functions
+inline const coloridx &ex_to_coloridx(const ex &e)
+{
+       return static_cast<const coloridx &>(*e.bp);
+}
 
-#define ex_to_coloridx(X) (static_cast<coloridx const &>(*(X).bp))
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
-#endif // ndef _COLORIDX_H_
+#endif // ndef __GINAC_COLORIDX_H__