Fix memory leaks in operators returning relationals.

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index 21df43059c645e886c7870c1078afaf70b6106e3..507776321c76e8d4d60b9c45db1ca0c9e9e226f5 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -185,9 +185,7 @@ public:
        // rational functions
        ex normal() const;
        ex to_rational(exmap & repl) const;
-       ex to_rational(lst & repl_lst) const;
        ex to_polynomial(exmap & repl) const;
-       ex to_polynomial(lst & repl_lst) const;
        ex numer() const;
        ex denom() const;
        ex numer_denom() const;
@@ -673,19 +671,19 @@ inline bool are_ex_trivially_equal(const ex &e1, const ex &e2)
 }
 
 /* Function objects for STL sort() etc. */
-struct ex_is_less : public std::binary_function<ex, ex, bool> {
+struct ex_is_less {
        bool operator() (const ex &lh, const ex &rh) const { return lh.compare(rh) < 0; }
 };
 
-struct ex_is_equal : public std::binary_function<ex, ex, bool> {
+struct ex_is_equal {
        bool operator() (const ex &lh, const ex &rh) const { return lh.is_equal(rh); }
 };
 
-struct op0_is_equal : public std::binary_function<ex, ex, bool> {
+struct op0_is_equal {
        bool operator() (const ex &lh, const ex &rh) const { return lh.op(0).is_equal(rh.op(0)); }
 };
 
-struct ex_swap : public std::binary_function<ex, ex, void> {
+struct ex_swap {
        void operator() (ex &lh, ex &rh) const { lh.swap(rh); }
 };
 
@@ -740,18 +738,12 @@ inline ex numer_denom(const ex & thisex)
 inline ex normal(const ex & thisex)
 { return thisex.normal(); }
 
-inline ex to_rational(const ex & thisex, lst & repl_lst)
-{ return thisex.to_rational(repl_lst); }
-
 inline ex to_rational(const ex & thisex, exmap & repl)
 { return thisex.to_rational(repl); }
 
 inline ex to_polynomial(const ex & thisex, exmap & repl)
 { return thisex.to_polynomial(repl); }
 
-inline ex to_polynomial(const ex & thisex, lst & repl_lst)
-{ return thisex.to_polynomial(repl_lst); }
-
 inline ex collect(const ex & thisex, const ex & s, bool distributed = false)
 { return thisex.collect(s, distributed); }