X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fexpair.h;h=443f20a96aea948bf1afec9850cf038b84482762;hb=refs%2Ftags%2Frelease_1-7-1;hp=ce17c8df51e1d3661dcdf3f94962a1526fbe428f;hpb=8dc09f48182574d792a2ed7c37b66831d9267a6c;p=ginac.git

diff --git a/ginac/expair.h b/ginac/expair.h
index ce17c8df..443f20a9 100644
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -3,7 +3,7 @@
  *  Definition of expression pairs (building blocks of expairseq). */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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,11 +17,11 @@
  *
  *  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_EXPAIR_H__
-#define __GINAC_EXPAIR_H__
+#ifndef GINAC_EXPAIR_H
+#define GINAC_EXPAIR_H
 
 #include "ex.h"
 #include "numeric.h"
@@ -92,7 +92,7 @@ public:
 };
 
 /** 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); }
 };
 
@@ -100,21 +100,17 @@ struct expair_is_less : public std::binary_function<expair, expair, bool> {
  *  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); }
 };
 
 inline void swap(expair & e1, expair & e2)
 { e1.swap(e2); }
 
-// This makes STL algorithms use the more efficient swap operation for ex objects
-inline void iter_swap(std::vector<expair>::iterator i1, std::vector<expair>::iterator i2)
-{ i1->swap(*i2); }
-
 } // namespace GiNaC
 
-#endif // ndef __GINAC_EXPAIR_H__
+#endif // ndef GINAC_EXPAIR_H