diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-17 17:29:12 -0400 |
---|---|---|
committer | lianah <lianahady@gmail.com> | 2014-06-19 18:24:39 -0400 |
commit | b766bc3bcc5510a283f8f35f3362b33f8a0ed461 (patch) | |
tree | c0685d64a12d7e35a113e39bc76cbdb7b673b20e /src/theory/arith | |
parent | 51dc426b0e217a4f1292be995f5473a7f2d27ad8 (diff) |
Final preparations for arithmetic for building with libc++.
Diffstat (limited to 'src/theory/arith')
-rw-r--r-- | src/theory/arith/normal_form.cpp | 2 | ||||
-rw-r--r-- | src/theory/arith/normal_form.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/theory/arith/normal_form.cpp b/src/theory/arith/normal_form.cpp index afaaedbf9..ce0bd9d30 100644 --- a/src/theory/arith/normal_form.cpp +++ b/src/theory/arith/normal_form.cpp @@ -90,7 +90,7 @@ bool Variable::isDivMember(Node n){ bool VarList::isSorted(iterator start, iterator end) { - return __gnu_cxx::is_sorted(start, end); + return std::is_sorted(start, end); } bool VarList::isMember(Node n) { diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h index 3267834b5..8d37bed23 100644 --- a/src/theory/arith/normal_form.h +++ b/src/theory/arith/normal_form.h @@ -28,7 +28,6 @@ #include <list> #include <algorithm> -#include <ext/algorithm> namespace CVC4 { namespace theory { @@ -510,7 +509,7 @@ private: public: - class iterator { + class iterator : public std::iterator<std::input_iterator_tag, Variable> { private: internal_iterator d_iter; @@ -732,7 +731,7 @@ public: } static bool isSorted(const std::vector<Monomial>& m) { - return __gnu_cxx::is_sorted(m.begin(), m.end()); + return std::is_sorted(m.begin(), m.end()); } static bool isStrictlySorted(const std::vector<Monomial>& m) { |