update boost

linx64/include/boost/test/data/monomorphic/array.hpp

@@ -35,7 +35,7 @@ class array {
 public:
     typedef T sample;
 
-    enum { arity = 1 };
+    static const int arity = 1;
 
     typedef T const* iterator;
 

linx64/include/boost/test/data/monomorphic/collection.hpp

@@ -41,7 +41,7 @@ class collection {
 public:
     typedef typename col_type::value_type sample;
 
-    enum { arity = 1 };
+    static const int arity = 1;
 
     typedef typename col_type::const_iterator iterator;
 

linx64/include/boost/test/data/monomorphic/delayed.hpp

@@ -48,7 +48,7 @@ template <class dataset_t, class ...Args>
 class delayed_dataset
 {
 public:
-    enum { arity = dataset_t::arity };
+    static const int arity = dataset_t::arity;
     using iterator = decltype(std::declval<dataset_t>().begin());
 
     delayed_dataset(Args... args)

linx64/include/boost/test/data/monomorphic/generate.hpp

@@ -48,7 +48,7 @@ class generated_by {
 public:
     typedef typename Generator::sample sample;
 
-    enum { arity = 1 };
+    static const int arity = 1;
 
     struct iterator {
         // Constructor

linx64/include/boost/test/data/monomorphic/grid.hpp

@@ -90,7 +90,7 @@ public:
     };
 
 public:
-    enum { arity = boost::decay<DataSet1>::type::arity + boost::decay<DataSet2>::type::arity };
+    static const int arity = boost::decay<DataSet1>::type::arity + boost::decay<DataSet2>::type::arity;
 
     //! Constructor
     grid( DataSet1&& ds1, DataSet2&& ds2 )

linx64/include/boost/test/data/monomorphic/initializer_list.hpp

@@ -41,7 +41,7 @@ namespace monomorphic {
 template<typename T>
 class init_list {
 public:
-    enum { arity = 1 };
+    static const int arity = 1;
 
     typedef typename std::vector<T>::const_iterator iterator;
 
@@ -75,9 +75,7 @@ class init_list<bool> {
 public:
     typedef bool sample;
 
-    enum { arity = 1 };
-
-    typedef std::vector<bool>::const_iterator iterator;
+    static const int arity = 1;
 
     //! Constructor copies content of initializer_list
     init_list( std::initializer_list<bool>&& il )
@@ -92,6 +90,24 @@ public:
     { }
 #endif
 
+    struct non_proxy_iterator {
+        std::vector<bool>::const_iterator iterator;
+        non_proxy_iterator(std::vector<bool>::const_iterator &&it)
+        : iterator(std::forward<std::vector<bool>::const_iterator>(it))
+        {}
+
+        bool operator*() const {
+            return *iterator;
+        }
+
+        non_proxy_iterator& operator++() {
+            ++iterator;
+            return *this;
+        }
+    };
+
+    typedef non_proxy_iterator iterator;
+
     //! dataset interface
     data::size_t    size() const    { return m_data.size(); }
     iterator        begin() const   { return m_data.begin(); }

linx64/include/boost/test/data/monomorphic/join.hpp

@@ -49,7 +49,7 @@ class join {
 
 public:
 
-    enum { arity = dataset1_decay::arity };
+    static const int arity = dataset1_decay::arity;
   
     using sample_t = typename std::conditional<
         std::is_reference<iter1_ret>::value && std::is_reference<iter2_ret>::value && std::is_same<iter1_ret, iter2_ret>::value,

linx64/include/boost/test/data/monomorphic/singleton.hpp

@@ -37,7 +37,7 @@ private:
 
 public:
 
-    enum { arity = 1 };
+    static const int arity = 1;
 
     struct iterator {
         // Constructor

linx64/include/boost/test/data/monomorphic/zip.hpp

@@ -48,7 +48,7 @@ class zip {
     typedef typename dataset2_decay::iterator       dataset2_iter;
 
 public:
-    enum { arity = dataset1_decay::arity + dataset2_decay::arity };
+    static const int arity = dataset1_decay::arity + dataset2_decay::arity;
 
     struct iterator {
         // Constructor