lortensor class

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 97e3e1a71229f4f056f8919b81c0d0227690ff57..7b425ba0697495fa76372e86178489c7cc5daeaf 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -1,7 +1,8 @@
 /** @file indexed.h
  *
- *  Interface to GiNaC's index carrying objects.
- *
+ *  Interface to GiNaC's index carrying objects. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,6 +26,10 @@
 #include <string>
 #include <ginac/exprseq.h>
 
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 /** Base class for non-commutative indexed objects */
 class indexed : public exprseq
 {
@@ -45,6 +50,7 @@ public:
     indexed(ex const & i1);
     indexed(ex const & i1, ex const & i2);
     indexed(ex const & i1, ex const & i2, ex const & i3);
+    indexed(ex const & i1, ex const & i2, ex const & i3, ex const & i4);
     indexed(exvector const & iv);
     indexed(exvector * iv);
 
@@ -85,10 +91,14 @@ protected:
 extern const indexed some_indexed;
 extern type_info const & typeid_indexed;
 
-// macros
+// utility functions
+inline const indexed &ex_to_indexed(const ex &e)
+{
+       return static_cast<const indexed &>(*e.bp);
+}
 
-#define ex_to_indexed(X) static_cast<indexed const &>(*(X).bp)
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_INDEXED_H__
-
-