#ifndef around namespace GiNaC { }

[ginac.git] / ginac / idx.h

diff --git a/ginac/idx.h b/ginac/idx.h
index 8e460d4c96e58b063c59184e45a50cef87d39e96..773b2e6b1ae9570abd8e2e896e57caa6e86819a1 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -2,13 +2,35 @@
  *
  *  Interface to GiNaC's indices. */
 
-#ifndef _IDX_H_
-#define _IDX_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_IDX_H__
+#define __GINAC_IDX_H__
 
 #include <string>
-#include <vector>
+//#include <vector>
+#include <ginac/basic.h>
+#include <ginac/ex.h>
 
-#include "basic.h"
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 class idx : public basic
 {
@@ -54,6 +76,8 @@ public:
     bool is_symbolic(void) const;
     unsigned get_value(void) const;
     bool is_covariant(void) const;
+    void setname(string const & n) {name=n;}
+    string getname(void) const {return name;}
 
     // member variables
 protected:
@@ -70,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);
@@ -87,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);
 
-#endif // ndef _IDX_H_
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
+#endif // ndef __GINAC_IDX_H__