- archiving implemented in lorentzidx

[ginac.git] / ginac / lorentzidx.h

diff --git a/ginac/lorentzidx.h b/ginac/lorentzidx.h
index 7fc2a05def876c699581f2970f4bc2c2a90f7d9e..25c91723a5d8476e686f475d1c739acc70ba7f10 100644 (file)
--- a/ginac/lorentzidx.h
+++ b/ginac/lorentzidx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's lorentz indices. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -27,8 +27,14 @@
 #include <vector>
 #include <ginac/idx.h>
 
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 class lorentzidx : public idx
 {
+    GINAC_DECLARE_REGISTERED_CLASS(lorentzidx, idx)
+
     friend class simp_lor;
     friend class scalar_products;
 
@@ -38,20 +44,20 @@ class lorentzidx : public idx
 public:
     lorentzidx();
     ~lorentzidx();
-    lorentzidx (lorentzidx const & other);
-    lorentzidx const & operator=(lorentzidx const & other);
+    lorentzidx (const lorentzidx & other);
+    const lorentzidx & operator=(const lorentzidx & other);
 protected:
-    void copy(lorentzidx const & other);
+    void copy(const lorentzidx & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
     explicit lorentzidx(bool cov, bool oonly=false, unsigned dimp=0);
-    explicit lorentzidx(string const & n, bool cov=false,
+    explicit lorentzidx(const string & n, bool cov=false,
                         bool oonly=false, unsigned dimp=0);
-    explicit lorentzidx(char const * n, bool cov=false,
+    explicit lorentzidx(const char * n, bool cov=false,
                         bool oonly=false, unsigned dimp=0);
-    explicit lorentzidx(unsigned const v, bool cov=false);
+    explicit lorentzidx(unsigned v, bool cov=false);
 
     // functions overriding virtual functions from bases classes
 public:
@@ -79,10 +85,16 @@ protected:
 // global constants
 
 extern const lorentzidx some_lorentzidx;
-extern type_info const & typeid_lorentzidx;
+extern const type_info & typeid_lorentzidx;
 
-// macros
+// utility functions
+inline const lorentzidx &ex_to_lorentzidx(const ex &e)
+{
+       return static_cast<const lorentzidx &>(*e.bp);
+}
 
-#define ex_to_lorentzidx(X) (static_cast<lorentzidx const &>(*(X).bp))
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_LORENTZIDX_H__