Final preparations for arithmetic for building with libc++.

diff --git a/src/theory/arith/normal_form.cpp b/src/theory/arith/normal_form.cpp
index afaaedbf9196c8de9b363d592d9f2dd976fa3fa9..ce0bd9d30dbfe9bc8db19fe6afd2ee7e8f037641 100644 (file)
--- 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 3267834b52084140f8694cea3c65a54ee30cf58b..8d37bed2374a5ca82908856ed8fabf8ac511d1f9 100644 (file)
--- 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) {