- Fixed wrong behaviour of new warning scheme.

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 43b390d9b6e8887199c28cadf9eb0c6132276045..a8f368bbe5b83911b3f7c8b71cce32630d22fc6c 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -25,15 +25,17 @@
 
 #include <string>
 #include <vector>
-#include <ginac/idx.h>
-#include <ginac/ex.h>
+#include "idx.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 class coloridx : public idx
 {
+    GINAC_DECLARE_REGISTERED_CLASS(coloridx, idx)
+
     friend class color;
 
 // member functions
@@ -42,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:
@@ -76,7 +78,7 @@ public:
 // global constants
 
 extern const coloridx some_coloridx;
-extern type_info const & typeid_coloridx;
+extern const type_info & typeid_coloridx;
 
 // utility functions
 inline const coloridx &ex_to_coloridx(const ex &e)
@@ -84,8 +86,8 @@ inline const coloridx &ex_to_coloridx(const ex &e)
        return static_cast<const coloridx &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_COLORIDX_H__