#ifndef around namespace GiNaC { }

[ginac.git] / ginac / idx.h

diff --git a/ginac/idx.h b/ginac/idx.h
index c742db6bce9c38b6dd3dd094f3019cc69003eea8..773b2e6b1ae9570abd8e2e896e57caa6e86819a1 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -1,7 +1,8 @@
 /** @file idx.h
  *
- *  Interface to GiNaC's indices.
- *
+ *  Interface to GiNaC's indices. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,8 +24,13 @@
 #define __GINAC_IDX_H__
 
 #include <string>
-#include <vector>
+//#include <vector>
 #include <ginac/basic.h>
+#include <ginac/ex.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class idx : public basic
 {
@@ -88,13 +94,15 @@ protected:
 extern const idx some_idx;
 extern type_info const & typeid_idx;
 
-// macros
-
-#define ex_to_idx(X) (static_cast<idx const &>(*(X).bp))
+// utility functions
+inline const idx &ex_to_idx(const ex &e)
+{
+       return static_cast<const idx &>(*e.bp);
+}
 
-// other functions
+// global functions
 
-typedef vector<ex> exvector;
+// typedef vector<ex> exvector;
 
 int canonicalize_indices(exvector & iv, bool antisymmetric=false);
 exvector idx_intersect(exvector const & iv1, exvector const & iv2);
@@ -105,4 +113,8 @@ ex subs_indices(ex const & e, exvector const & idxv_contra,
                 exvector const & idxv_co);
 unsigned count_index(ex const & e, ex const & i);
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
 #endif // ndef __GINAC_IDX_H__