- ginac/operators.cpp: added some missing debugmsg()'s, which would have

[ginac.git] / ginac / structure.cpp

diff --git a/ginac/structure.cpp b/ginac/structure.cpp
index 539eaf76fba1c8781aa121dea3a2a4df6e68858b..4e27c49e1db8fc499f8a190a8fd4db3c82969c6f 100644 (file)
--- a/ginac/structure.cpp
+++ b/ginac/structure.cpp
@@ -3,7 +3,7 @@
  *  Implementation of 'abstract' class structure. */
 
 /*
- *  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
@@ -25,7 +25,9 @@
 #include "structure.h"
 #include "debugmsg.h"
 
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -45,13 +47,13 @@ structure::~structure()
     destroy(0);
 }
 
-structure::structure(structure const & other)
+structure::structure(const structure & other)
 {
     debugmsg("structure copy constructor",LOGLEVEL_CONSTRUCT);
     copy(other);
 }
 
-structure const & structure::operator=(structure const & other)
+const structure & structure::operator=(const structure & other)
 {
     debugmsg("structure operator=",LOGLEVEL_ASSIGNMENT);
     if (this != &other) {
@@ -63,7 +65,7 @@ structure const & structure::operator=(structure const & other)
 
 // protected
 
-void structure::copy(structure const & other)
+void structure::copy(const structure & other)
 {
     basic::copy(other);
 }
@@ -123,13 +125,13 @@ void structure::printcsrc(ostream & os, unsigned type, unsigned upper_precedence
 
 // protected
 
-int structure::compare_same_type(basic const & other) const
+int structure::compare_same_type(const basic & other) const
 {
     GINAC_ASSERT(is_of_type(other, structure));
     return 0; // all structures are the same
 }
 
-bool structure::is_equal_same_type(basic const & other) const
+bool structure::is_equal_same_type(const basic & other) const
 {
     GINAC_ASSERT(is_of_type(other, structure));
     return true; // all structures are the same
@@ -155,7 +157,7 @@ vector<registered_structure_info> & structure::registered_structures(void)
 
 // public
 
-unsigned structure::register_new(char const * nm)
+unsigned structure::register_new(const char * nm)
 {
     registered_structure_info rsi={nm};
     registered_structures().push_back(rsi);
@@ -173,6 +175,8 @@ unsigned structure::register_new(char const * nm)
 //////////
 
 const structure some_structure;
-type_info const & typeid_structure=typeid(some_structure);
+const type_info & typeid_structure=typeid(some_structure);
 
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC