- put everything in "GiNaC" namespace

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 8f7e8254681b4c0739b6848a1299e2d3fbad2981..7861c899cb9242cac9f118ab3cbbb47fcc3a52b0 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -1,7 +1,8 @@
 /** @file coloridx.h
  *
- *  Interface to GiNaC's color indices.
- *
+ *  Interface to 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
@@ -24,6 +25,10 @@
 
 #include <string>
 #include <vector>
+#include <ginac/idx.h>
+#include <ginac/ex.h>
+
+namespace GiNaC {
 
 class coloridx : public idx
 {
@@ -71,8 +76,12 @@ public:
 extern const coloridx some_coloridx;
 extern type_info const & 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))
+} // namespace GiNaC
 
 #endif // ndef __GINAC_COLORIDX_H__