2 files changed, 23 insertions, 16 deletions
diff --git a/src/bindings/java/CMakeLists.txt b/src/bindings/java/CMakeLists.txt
index 573c2ee91..7b7d93f1d 100644
--- a/src/bindings/java/CMakeLists.txt
+++ b/src/bindings/java/CMakeLists.txt
@@ -165,6 +165,7 @@ set(gen_java_files
   ${CMAKE_CURRENT_BINARY_DIR}/SExpr.java
   ${CMAKE_CURRENT_BINARY_DIR}/SExprKeyword.java
   ${CMAKE_CURRENT_BINARY_DIR}/SExprType.java
+  ${CMAKE_CURRENT_BINARY_DIR}/Statistic.java
   ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_CVC4__Model.java
   ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_CVC4__Printer.java
   ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_CVC4__api__Solver.java
diff --git a/src/bindings/java_iterator_adapter.h b/src/bindings/java_iterator_adapter.h
index bf1b22e1b..270fe7baa 100644
--- a/src/bindings/java_iterator_adapter.h
+++ b/src/bindings/java_iterator_adapter.h
@@ -30,30 +30,36 @@
 #ifndef CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
 #define CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H
 
-namespace CVC4 {
+#include <type_traits>
 
-template <class T>
-class JavaIteratorAdapter {
-  const T& d_t;
-  typename T::const_iterator d_it;
+namespace CVC4 {
 
-public:
-  JavaIteratorAdapter(const T& t) :
-    d_t(t),
-    d_it(d_t.begin()) {
+template <class T, class value_type>
+class JavaIteratorAdapter
+{
+ public:
+  JavaIteratorAdapter(const T& t) : d_t(t), d_it(d_t.begin())
+  {
+    static_assert(
+        std::is_convertible<typename T::const_iterator::value_type,
+                            value_type>(),
+        "value_type must be convertible from T::const_iterator::value_type");
   }
 
-  bool hasNext() {
-    return d_it != d_t.end();
-  }
+  bool hasNext() { return d_it != d_t.end(); }
 
-  typename T::const_iterator::value_type getNext() {
-    typename T::const_iterator::value_type ret = *d_it;
+  value_type getNext()
+  {
+    value_type ret = *d_it;
     ++d_it;
     return ret;
   }
-};/* class JavaIteratorAdapter<T> */
 
-}/* CVC4 namespace */
+ private:
+  const T& d_t;
+  typename T::const_iterator d_it;
+}; /* class JavaIteratorAdapter<T, value_type> */
+
+}  // namespace CVC4
 
 #endif /* CVC4__BINDINGS__JAVA_ITERATOR_ADAPTER_H */