X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fstructure.h;h=960724fd9b91524400f3cae6512ad2d718b77572;hp=dbe97d4226740060ef3a329a5b8913534ef2a117;hb=d0b3e67ddbbe031fefbe3e88e8bf8860424d0d4b;hpb=69cf20e8ee183eadfe457af33dc88a9f568038e8

diff --git a/ginac/structure.h b/ginac/structure.h
index dbe97d42..960724fd 100644
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -3,7 +3,7 @@
  *  Wrapper template for making GiNaC classes out of C++ structures. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -17,7 +17,7 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_STRUCTURE_H__
@@ -26,13 +26,13 @@
 #include <functional>
 
 #include "ex.h"
+#include "ncmul.h"
+#include "numeric.h"
 #include "operators.h"
 #include "print.h"
 
 namespace GiNaC {
 
-extern unsigned next_structure_tinfo_key;
-
 
 /** Comparison policy: all structures of one type are equal */
 template <class T>
@@ -117,8 +117,9 @@ class structure : public basic, public ComparisonPolicy<T> {
 	GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
 
 	// helpers
-	static unsigned get_tinfo() { return reg_info.options.get_id(); }
+	static tinfo_t get_tinfo() { return reg_info.options.get_id(); }
 	static const char *get_class_name() { return "structure"; }
+	static tinfo_t next_structure_tinfo_key() { return new tinfo_static_t; }
 
 	// constructors
 public:
@@ -133,7 +134,7 @@ public:
 	ex evalf(int level = 0) const { return inherited::evalf(level); }
 	ex evalm() const { return inherited::evalm(); }
 protected:
-	ex eval_ncmul(const exvector & v) const { return this->hold_ncmul(v); }
+	ex eval_ncmul(const exvector & v) const { return hold_ncmul(v); }
 public:
 	ex eval_indexed(const basic & i) const { return i.hold(); }
 
@@ -154,7 +155,7 @@ public:
 	ex & operator[](size_t i) { return inherited::operator[](i); }
 
 	// pattern matching
-	bool has(const ex & other) const { return inherited::has(other); }
+	bool has(const ex & other, unsigned options = 0) const { return inherited::has(other, options); }
 	bool match(const ex & pattern, lst & repl_lst) const { return inherited::match(pattern, repl_lst); }
 protected:
 	bool match_same_type(const basic & other) const { return true; }
@@ -194,12 +195,12 @@ public:
 	// indexed objects
 	exvector get_free_indices() const { return exvector(); }
 	ex add_indexed(const ex & self, const ex & other) const { return self + other; }
-	ex scalar_mul_indexed(const ex & self, const numeric & other) const { return self * other; }
+	ex scalar_mul_indexed(const ex & self, const numeric & other) const { return self * ex(other); }
 	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const { return false; }
 
 	// noncommutativity
 	unsigned return_type() const { return return_types::commutative; }
-	unsigned return_type_tinfo() const { return tinfo(); }
+	tinfo_t return_type_tinfo() const { return this; }
 
 protected:
 	bool is_equal_same_type(const basic & other) const
@@ -218,7 +219,6 @@ public:
 	const T *operator->() const { return &obj; }
 	T &get_struct() { return obj; }
 	const T &get_struct() const { return obj; }
-
 private:
 	T obj;
 };
@@ -257,7 +257,7 @@ int structure<T, CP>::compare_same_type(const basic & other) const
 }
 
 template <class T, template <class> class CP>
-registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", next_structure_tinfo_key++, &structure::unarchive));
+registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", structure::next_structure_tinfo_key(), &structure::unarchive));
 
 
 } // namespace GiNaC