#ifndef around namespace GiNaC { }

[ginac.git] / ginac / coloridx.h

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 92e6b1ff3dfcae4d5703d20aad6c3d91d0564a9d..105f4a3592e12fc0a668e56ac1ddfd96158e2ea6 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -2,13 +2,35 @@
  *
  *  Interface to GiNaC's color indices. */
 
-#ifndef _COLORIDX_H_
-#define _COLORIDX_H_
+/*
+ *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __GINAC_COLORIDX_H__
+#define __GINAC_COLORIDX_H__
 
 #include <string>
 #include <vector>
+#include <ginac/idx.h>
+#include <ginac/ex.h>
 
-#include "idx.h"
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class coloridx : public idx
 {
@@ -56,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 _COLORIDX_H_
+#endif // ndef __GINAC_COLORIDX_H__