mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 03:32:28 +00:00
Code Activity

Made it more legal C++17

Browse source
This commit is contained in:
Matthew Parkinson 2018-10-15 16:59:31 +01:00
parent b1ab473035
commit 01005a46f6
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/muz/spacer/spacer_context.h
View file

@ -28,6 +28,7 @@ Notes:
#undef max
#endif
#include <queue>
#include <functional>
#include "util/scoped_ptr_vector.h"
#include "muz/spacer/spacer_manager.h"
#include "muz/spacer/spacer_prop_solver.h"
@ -189,7 +190,7 @@ public:
}
};
struct lemma_lt_proc : public std::binary_function<lemma*, lemma *, bool> {
struct lemma_lt_proc : public std::function<bool(lemma*, lemma *)> {
bool operator() (lemma *a, lemma *b) {
return (a->level () < b->level ()) ||
(a->level () == b->level () &&
@ -727,11 +728,11 @@ inline std::ostream &operator<<(std::ostream &out, pob const &p) {
return p.display(out);
}
struct pob_lt_proc : public std::binary_function<const pob*, const pob*, bool> {
struct pob_lt_proc : public std::function<bool(const pob*, const pob*)> {
bool operator() (const pob *pn1, const pob *pn2) const;
};
struct pob_gt_proc : public std::binary_function<const pob*, const pob*, bool> {
struct pob_gt_proc : public std::function<bool(const pob*, const pob*)> {
bool operator() (const pob *n1, const pob *n2) const {
return pob_lt_proc()(n2, n1);
}

3
src/muz/spacer/spacer_quant_generalizer.cpp
View file

@ -19,6 +19,7 @@ Revision History:
--*/
#include <functional>
#include "muz/spacer/spacer_context.h"
#include "muz/spacer/spacer_generalizers.h"
@ -36,7 +37,7 @@ Revision History:
using namespace spacer;
namespace {
struct index_lt_proc : public std::binary_function<app*, app *, bool> {
struct index_lt_proc : public std::function<bool(app*, app*)> {
arith_util m_arith;
index_lt_proc(ast_manager &m) : m_arith(m) {}
bool operator() (app *a, app *b) {