Removin binary_function from ginac code

Author: kiwifb

src/sage/symbolic/ginac/ex.h

@@ -677,19 +677,19 @@ std::ostream & operator<<(std::ostream & os, const exset & e);
 std::ostream & operator<<(std::ostream & os, const exmap & e);
 
 /* 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); }
 };
 

src/sage/symbolic/ginac/expair.h

@@ -91,19 +91,19 @@ class expair
 };
 
 /** Function object for insertion into third argument of STL's sort() etc. */
-struct expair_is_less : public std::binary_function<expair, expair, bool> {
+struct expair_is_less {
 	bool operator()(const expair &lh, const expair &rh) const { return lh.is_less(rh); }
 };
 
 /** Function object not caring about the numerical coefficients for insertion
  *  into third argument of STL's sort().  Note that this does not define a
  *  strict weak ordering since for any symbol x we have neither 3*x<2*x or
  *  2*x<3*x.  Handle with care! */
-struct expair_rest_is_less : public std::binary_function<expair, expair, bool> {
+struct expair_rest_is_less {
 	bool operator()(const expair &lh, const expair &rh) const { return (lh.rest.compare(rh.rest)<0); }
 };
 
-struct expair_swap : public std::binary_function<expair, expair, void> {
+struct expair_swap {
 	void operator()(expair &lh, expair &rh) const { lh.swap(rh); }
 };
 

src/sage/symbolic/ginac/order.h

@@ -35,7 +35,7 @@
 
 namespace GiNaC {
 
-class print_order : public std::binary_function<ex, ex, bool> {
+class print_order {
 private:
 	const tinfo_t& function_id() const;
 	const tinfo_t& fderivative_id() const;
@@ -96,9 +96,7 @@ class print_order_mul : public print_order {
 
 // We have to define the following class to sort held expressions
 // E.g. 3*x+2*x which does not get simplified to 5*x.
-class print_order_pair : 
-	public std::binary_function<expair, expair, bool>
-{
+class print_order_pair {
 public:
 	bool operator() (const expair &lh, const expair &rh) const;
 	bool compare_degrees(const expair &lhex, const expair &rhex) const;

src/sage/symbolic/ginac/ptr.h

@@ -158,8 +158,7 @@ namespace std {
 
 /** Specialization of std::less for ptr<T> to enable ordering of ptr<T>
  *  objects (e.g. for the use as std::map keys). */
-template <class T> struct less< GiNaC::ptr<T> >
- : public binary_function<GiNaC::ptr<T>, GiNaC::ptr<T>, bool> {
+template <class T> struct less< GiNaC::ptr<T> > {
 	bool operator()(const GiNaC::ptr<T> &lhs, const GiNaC::ptr<T> &rhs) const
 	{
 		return less<T*>()(lhs.p, rhs.p);