#ifndef around namespace GiNaC { }

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 4fb6a759d74bf4284b1d2a05ba19fd904300a73f..105f4a3592e12fc0a668e56ac1ddfd96158e2ea6 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
@@ -25,6 +26,11 @@
 #include <string>
 #include <vector>
 #include <ginac/idx.h>
+#include <ginac/ex.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class coloridx : public idx
 {
@@ -72,8 +78,14 @@ 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))
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_COLORIDX_H__