X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fstructure.h;h=22e684008fd5395fc5e191d47efd6518c6782e88;hp=1c28d7501a3fb40c30ef742f372546e5bb90b13a;hb=e8c6a2891bc68ca8f97a7d4b8bd0dd3ac322d982;hpb=44ec54892fdadceeb95e78e786f0411860f342ad

diff --git a/ginac/structure.h b/ginac/structure.h
index 1c28d750..22e68400 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-2005 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
@@ -26,6 +26,9 @@
 #include <functional>
 
 #include "ex.h"
+#include "ncmul.h"
+#include "numeric.h"
+#include "operators.h"
 #include "print.h"
 
 namespace GiNaC {
@@ -182,8 +185,8 @@ public:
 
 	// rational functions
 	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const { return inherited::normal(repl, rev_lookup, level); }
-	ex to_rational(lst & repl_lst) const { return inherited::to_rational(repl_lst); }
-	ex to_polynomial(lst & repl_lst) const { return inherited::to_polynomial(repl_lst); }
+	ex to_rational(exmap & repl) const { return inherited::to_rational(repl); }
+	ex to_polynomial(exmap & repl) const { return inherited::to_polynomial(repl); }
 
 	// polynomial algorithms
 	numeric integer_content() const { return 1; }
@@ -193,7 +196,7 @@ 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