mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-30 19:22:28 +00:00
Code Activity

Revert "Made Z3 compile for C++17 with MSVC"

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-10-15 12:52:19 -07:00 • committed by GitHub
parent 4916de874b
commit 6704a4be02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,6 @@ 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"
@ -190,7 +189,7 @@ public:
}
};
struct lemma_lt_proc : public std::function<bool(lemma*, lemma *)> {
struct lemma_lt_proc : public std::binary_function<lemma*, lemma *, bool> {
bool operator() (lemma *a, lemma *b) {
return (a->level () < b->level ()) ||
(a->level () == b->level () &&
@ -728,11 +727,11 @@ inline std::ostream &operator<<(std::ostream &out, pob const &p) {
return p.display(out);
}
struct pob_lt_proc : public std::function<bool(const pob*, const pob*)> {
struct pob_lt_proc : public std::binary_function<const pob*, const pob*, bool> {
bool operator() (const pob *pn1, const pob *pn2) const;
};
struct pob_gt_proc : public std::function<bool(const pob*, const pob*)> {
struct pob_gt_proc : public std::binary_function<const pob*, const pob*, bool> {
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,7 +19,6 @@ Revision History:
--*/
#include <functional>
#include "muz/spacer/spacer_context.h"
#include "muz/spacer/spacer_generalizers.h"
@ -37,7 +36,7 @@ Revision History:
using namespace spacer;
namespace {
struct index_lt_proc : public std::function<bool(app*, app*)> {
struct index_lt_proc : public std::binary_function<app*, app *, bool> {
arith_util m_arith;
index_lt_proc(ast_manager &m) : m_arith(m) {}
bool operator() (app *a, app *b) {