- Cleanup and clarifications.

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index a0fe9b7dfb5e26d58087482a54958a15583717b5..5bd74685a3e8c8eee90bfb22ecf1c40e6526ea6d 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -23,14 +23,14 @@
 #ifndef __GINAC_STRUCTURE_H__
 #define __GINAC_STRUCTURE_H__
 
-#include <ginac/basic.h>
+#include "basic.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 struct registered_structure_info {
-    char const * name;
+    const char * name;
 };
 
 /** The class structure is used to implement user defined classes
@@ -47,10 +47,10 @@ class structure : public basic
 public:
     structure();
     ~structure();
-    structure(structure const & other);
-    structure const & operator=(structure const & other);
+    structure(const structure & other);
+    const structure & operator=(const structure & other);
 protected:
-    void copy(structure const & other);
+    void copy(const structure & other);
     void destroy(bool call_parent);
 
     // other constructors
@@ -64,8 +64,8 @@ public:
     void printtree(ostream & os, unsigned indent) const;
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    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
     // none
@@ -74,7 +74,7 @@ protected:
 protected:
     static vector<registered_structure_info> & registered_structures(void);
 public:
-    static unsigned register_new(char const * nm);
+    static unsigned register_new(const char * nm);
 
 // member variables
 // none
@@ -84,10 +84,10 @@ public:
 // global constants
 
 extern const structure some_structure;
-extern type_info const & typeid_structure;
+extern const type_info & typeid_structure;
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_STRUCTURE_H__