- lcm_of_coefficients() works for unexpanded polynomials

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 1753b429be3b9694d05baa82ab3d2ed39baa480d..266dcf9276be0c25852b91b71462b0d7ed1d526b 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's color indices. */
 
 /*
- *  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
@@ -26,9 +26,16 @@
 #include <string>
 #include <vector>
 #include <ginac/idx.h>
+#include <ginac/ex.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class coloridx : public idx
 {
+    GINAC_DECLARE_REGISTERED_CLASS(coloridx, idx)
+
     friend class color;
 
 // member functions
@@ -37,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:
@@ -71,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_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_COLORIDX_H__