- Fixed a logic error in numeric::info().

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index b1c8bef7480cde3dc4c953c1b1c5087d7f9e869e..5bd74685a3e8c8eee90bfb22ecf1c40e6526ea6d 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -2,15 +2,35 @@
  *
  *  Interface to 'abstract' class structure. */
 
-#ifndef _STRUCTURE_H_
-#define _STRUCTURE_H_
+/*
+ *  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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-class structure;
+#ifndef __GINAC_STRUCTURE_H__
+#define __GINAC_STRUCTURE_H__
 
 #include "basic.h"
 
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#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
@@ -27,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
@@ -44,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
@@ -54,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
@@ -64,7 +84,10 @@ public:
 // global constants
 
 extern const structure some_structure;
-extern type_info const & typeid_structure;
+extern const type_info & typeid_structure;
 
-#endif // ndef _STRUCTURE_H_
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
+#endif // ndef __GINAC_STRUCTURE_H__