- rotate_31() and golden_hash_ratio() moved to utils.h

[ginac.git] / ginac / coloridx.cpp

diff --git a/ginac/coloridx.cpp b/ginac/coloridx.cpp
index be7768d7dfb75b93d5122b320471b586432d03e0..dc8eed7d9c35533c574ff5a90187d4a8ec337ace 100644 (file)
--- a/ginac/coloridx.cpp
+++ b/ginac/coloridx.cpp
@@ -1,7 +1,8 @@
 /** @file coloridx.cpp
  *
- *  Implementation of GiNaC's color indices.
- *
+ *  Implementation of GiNaC's color indices. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,8 +22,11 @@
 
 #include <stdexcept>
 
-#include "ginac.h"
+#include "coloridx.h"
 #include "utils.h"
+#include "debugmsg.h"
+
+namespace GiNaC {
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -35,7 +39,7 @@ coloridx::coloridx()
     debugmsg("coloridx default constructor",LOGLEVEL_CONSTRUCT);
     // serial is incremented in idx::idx()
     name="color"+ToString(serial);
-    tinfo_key=TINFO_COLORIDX;
+    tinfo_key=TINFO_coloridx;
 }
 
 coloridx::~coloridx() 
@@ -83,25 +87,25 @@ coloridx::coloridx(bool cov) : idx(cov)
     debugmsg("coloridx constructor from bool",LOGLEVEL_CONSTRUCT);
     // serial is incremented in idx::idx(bool)
     name="color"+ToString(serial);
-    tinfo_key=TINFO_COLORIDX;
+    tinfo_key=TINFO_coloridx;
 }
 
 coloridx::coloridx(string const & n, bool cov) : idx(n,cov)
 {
     debugmsg("coloridx constructor from string,bool",LOGLEVEL_CONSTRUCT);
-    tinfo_key=TINFO_COLORIDX;
+    tinfo_key=TINFO_coloridx;
 }
 
 coloridx::coloridx(char const * n, bool cov) : idx(n,cov)
 {
     debugmsg("coloridx constructor from char*,bool",LOGLEVEL_CONSTRUCT);
-    tinfo_key=TINFO_COLORIDX;
+    tinfo_key=TINFO_coloridx;
 }
 
 coloridx::coloridx(unsigned const v, bool cov) : idx(v,cov)
 {
     debugmsg("coloridx constructor from unsigned,bool",LOGLEVEL_CONSTRUCT);
-    tinfo_key=TINFO_COLORIDX;
+    tinfo_key=TINFO_coloridx;
 }
 
 //////////
@@ -209,5 +213,4 @@ bool coloridx::info(unsigned inf) const
 const coloridx some_coloridx;
 type_info const & typeid_coloridx=typeid(some_coloridx);
 
-
-
+} // namespace GiNaC