- removed inert Diff() function; only Derivative() remains

[ginac.git] / ginac / color.h

diff --git a/ginac/color.h b/ginac/color.h
index 6a464edc62911298aeebcec886767ae67ae6d9b9..6e852575ddcef3de200932ba2a229fa2985c6d93 100644 (file)
--- a/ginac/color.h
+++ b/ginac/color.h
@@ -25,12 +25,12 @@
 
 #include <string>
 #include <vector>
-#include <ginac/indexed.h>
-#include <ginac/ex.h>
+#include "indexed.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 const unsigned MAX_REPRESENTATION_LABELS = 4;
 const unsigned COLOR_EIGHT = 8; // N*N-1
@@ -41,6 +41,8 @@ typedef vector<exvector,malloc_alloc> exvectorvector;
 /** Base class for color object */
 class color : public indexed
 {
+    GINAC_DECLARE_REGISTERED_CLASS(color, indexed)
+
 // friends
 
     friend color color_ONE(unsigned rl);
@@ -166,8 +168,8 @@ ex brute_force_sum_color_indices(const ex & e);
 
 void append_exvector_to_exvector(exvector & dest, const exvector & source);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_COLOR_H__