- put everything in "GiNaC" namespace

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 1753b429be3b9694d05baa82ab3d2ed39baa480d..7861c899cb9242cac9f118ab3cbbb47fcc3a52b0 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -26,6 +26,9 @@
 #include <string>
 #include <vector>
 #include <ginac/idx.h>
+#include <ginac/ex.h>
+
+namespace GiNaC {
 
 class coloridx : public idx
 {
@@ -73,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__