X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpair.h;h=218eb481ac8b64a56a2631c82d0cdf4e4a2c2d62;hp=aa4a72cdd2f45b6552d5909dda4f32a4ed7ac913;hb=HEAD;hpb=1602530f716ba1d425a0667b897182b99c374823 diff --git a/ginac/expair.h b/ginac/expair.h index aa4a72cd..452a6f2c 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-2009 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2024 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 @@ -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 { +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 { * 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 { +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 { +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::iterator i1, std::vector::iterator i2) -{ i1->swap(*i2); } - } // namespace GiNaC #endif // ndef GINAC_EXPAIR_H