* ginac/registrar.h: dtor is inlined now.

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 03dfa77af5593ed0d03b605f47641233938be473..94ba0e6860c8d8cec78262d2ca622403f055fbbd 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's index carrying objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -26,27 +26,14 @@
 #include <string>
 #include "exprseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
-/** Base class for non-commutative indexed objects */
+
+/** Base class for objects with indices. */
 class indexed : public exprseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(indexed, exprseq)
 
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       indexed();
-       ~indexed();
-       indexed(const indexed & other);
-       const indexed & operator=(const indexed & other);
-protected:
-       void copy(const indexed & other); 
-       void destroy(bool call_parent);
-
        // other constructors
 public:
        indexed(const ex & i1);
@@ -58,16 +45,17 @@ public:
 
        // functions overriding virtual functions from base classes
 public:
-       basic * duplicate() const;
        void printraw(std::ostream & os) const;
        void printtree(std::ostream & os, unsigned indent) const;
        void print(std::ostream & os, unsigned upper_precedence=0) const;
        void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
        bool info(unsigned inf) const;
-       exvector get_indices(void) const;
+
+       /** Return the vector of indices on this object. */
+       exvector get_indices(void) const {return seq;}
+
 protected:
        ex derivative(const symbol & s) const;
-       int compare_same_type(const basic & other) const;
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type(void) const;
        unsigned return_type_tinfo(void) const;
@@ -88,19 +76,12 @@ protected:
        // none
 };
 
-// global constants
-
-extern const indexed some_indexed;
-extern const type_info & typeid_indexed;
-
 // utility functions
 inline const indexed &ex_to_indexed(const ex &e)
 {
        return static_cast<const indexed &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INDEXED_H__