sums of indexed matrices are now possible

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index 28abe6adaf8c40f9f390fdf18f87b00ac6fdde14..12b86d1c4a1b8f6c7f241e82b25c47ce5d1caac8 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -25,9 +25,7 @@
 
 #include "basic.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 struct registered_structure_info {
        const char * name;
@@ -41,30 +39,18 @@ struct registered_structure_info {
 
 class structure : public basic
 {
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       structure();
-       ~structure();
-       structure(const structure & other);
-       const structure & operator=(const structure & other);
-protected:
-       void copy(const structure & other);
-       void destroy(bool call_parent);
-
-       // other constructors
+       GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
+       
+       // other ctors
        // none
 
        // functions overriding virtual functions from bases classes
 public:
-       basic * duplicate() const;
        void printraw(std::ostream & os) const; 
        void print(std::ostream & os, unsigned upper_precedence=0) const;
        void printtree(std::ostream & os, unsigned indent) const;
        void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
 protected:
-       int compare_same_type(const basic & other) const;
        bool is_equal_same_type(const basic & other) const;
        
        // new virtual functions which can be overridden by derived classes
@@ -81,8 +67,6 @@ public:
 
 };
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_STRUCTURE_H__