Merge pull request #1041 from diffblue/add_empty

Add empty() to containers with size()

Author: tautschnig

src/pointer-analysis/value_set_fivr.h

@@ -84,12 +84,13 @@ class value_set_fivrt
     typedef objmapt::iterator iterator;
 
     const_iterator find(unsigned k) { return objmap.find(k); }
-    iterator begin(void) { return objmap.begin(); }
-    const_iterator begin(void) const { return objmap.begin(); }
-    iterator end(void) { return objmap.end(); }
-    const_iterator end(void) const { return objmap.end(); }
-    size_t size(void) const { return objmap.size(); }
-    void clear(void) { objmap.clear(); validity_ranges.clear(); }
+    iterator begin() { return objmap.begin(); }
+    const_iterator begin() const { return objmap.begin(); }
+    iterator end() { return objmap.end(); }
+    const_iterator end() const { return objmap.end(); }
+    size_t size() const { return objmap.size(); }
+    bool empty() const { return objmap.empty(); }
+    void clear() { objmap.clear(); validity_ranges.clear(); }
 
     objectt &operator[](unsigned k)
     {
@@ -112,7 +113,7 @@ class value_set_fivrt
       unsigned function;
       unsigned from, to;
 
-      validity_ranget(void):
+      validity_ranget():
         function(0), from(0), to(0)
       {
       }
@@ -318,7 +319,7 @@ class value_set_fivrt
     const exprt &code,
     const namespacet &ns);
 
-  bool handover(void);
+  bool handover();
 
   void assign(
     const exprt &lhs,

src/pointer-analysis/value_set_fivrns.cpp

@@ -1508,7 +1508,7 @@ bool value_set_fivrnst::object_map_dt::is_valid_at(
   return false;
 }
 
-bool value_set_fivrnst::handover(void)
+bool value_set_fivrnst::handover()
 {
   bool changed=false;
 

src/pointer-analysis/value_set_fivrns.h

@@ -85,12 +85,13 @@ class value_set_fivrnst
     typedef objmapt::iterator iterator;
 
     const_iterator find(unsigned k) { return objmap.find(k); }
-    iterator begin(void) { return objmap.begin(); }
-    const_iterator begin(void) const { return objmap.begin(); }
-    iterator end(void) { return objmap.end(); }
-    const_iterator end(void) const { return objmap.end(); }
-    size_t size(void) const { return objmap.size(); }
-    void clear(void) { objmap.clear(); validity_ranges.clear(); }
+    iterator begin() { return objmap.begin(); }
+    const_iterator begin() const { return objmap.begin(); }
+    iterator end() { return objmap.end(); }
+    const_iterator end() const { return objmap.end(); }
+    size_t size() const { return objmap.size(); }
+    bool empty() const { return objmap.empty(); }
+    void clear() { objmap.clear(); validity_ranges.clear(); }
 
     objectt &operator[](unsigned k)
     {
@@ -113,7 +114,7 @@ class value_set_fivrnst
       unsigned function;
       unsigned from, to;
 
-      validity_ranget(void):
+      validity_ranget():
         function(0), from(0), to(0)
       {
       }
@@ -315,7 +316,7 @@ class value_set_fivrnst
     const exprt &code,
     const namespacet &ns);
 
-  bool handover(void);
+  bool handover();
 
   void assign(
     const exprt &lhs,

src/solvers/sat/satcheck_minisat2.cpp

@@ -15,6 +15,7 @@ Author: Daniel Kroening, [email protected]
 #include <stack>
 
 #include <util/threeval.h>
+#include <util/invariant.h>
 
 #include "satcheck_minisat2.h"