- corrected a bunch of typos.

[ginac.git] / ginac / structure.cpp

diff --git a/ginac/structure.cpp b/ginac/structure.cpp
index b155f946629988c48c92e79c170f62adc0431a1c..539eaf76fba1c8781aa121dea3a2a4df6e68858b 100644 (file)
--- a/ginac/structure.cpp
+++ b/ginac/structure.cpp
@@ -1,7 +1,8 @@
 /** @file structure.cpp
  *
- *  Implementation of 'abstract' class structure.
- *
+ *  Implementation of 'abstract' class structure. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,7 +22,10 @@
 
 #include <string>
 
-#include "ginac.h"
+#include "structure.h"
+#include "debugmsg.h"
+
+namespace GiNaC {
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -32,7 +36,7 @@
 structure::structure()
 {
     debugmsg("structure default constructor",LOGLEVEL_CONSTRUCT);
-    tinfo_key = TINFO_STRUCTURE;
+    tinfo_key = TINFO_structure;
 }
 
 structure::~structure()
@@ -121,13 +125,13 @@ void structure::printcsrc(ostream & os, unsigned type, unsigned upper_precedence
 
 int structure::compare_same_type(basic const & other) const
 {
-    ASSERT(is_of_type(other, structure));
+    GINAC_ASSERT(is_of_type(other, structure));
     return 0; // all structures are the same
 }
 
 bool structure::is_equal_same_type(basic const & other) const
 {
-    ASSERT(is_of_type(other, structure));
+    GINAC_ASSERT(is_of_type(other, structure));
     return true; // all structures are the same
 }
 
@@ -171,3 +175,4 @@ unsigned structure::register_new(char const * nm)
 const structure some_structure;
 type_info const & typeid_structure=typeid(some_structure);
 
+} // namespace GiNaC