1 files changed, 68 insertions, 7 deletions

diff --git a/boost/test/data/monomorphic/initializer_list.hpp b/boost/test/data/monomorphic/initializer_list.hpp
index 3221597396..3f4a4df045 100644
--- a/boost/test/data/monomorphic/initializer_list.hpp
+++ b/boost/test/data/monomorphic/initializer_list.hpp
@@ -16,6 +16,7 @@
 #include <boost/test/data/config.hpp>
 #include <boost/test/data/monomorphic/fwd.hpp>
 
+#include <boost/core/ignore_unused.hpp>
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
@@ -26,10 +27,14 @@ namespace data {
 namespace monomorphic {
 
 // ************************************************************************** //
-// **************                     array                    ************** //
+// **************                initializer_list              ************** //
 // ************************************************************************** //
 
-/// Dataset view of a C array
+/// Dataset view from an initializer_list or variadic template arguments
+///
+/// The data should be stored in the dataset, and since the elements
+/// are passed by an @c std::initializer_list , it implies a copy of
+/// the elements.
 template<typename T>
 class init_list {
 public:
@@ -37,12 +42,22 @@ public:
 
     enum { arity = 1 };
 
-    typedef T const* iterator;
+    typedef typename std::vector<T>::const_iterator iterator;
 
-    //! Constructor swallows initializer_list
-    init_list( std::initializer_list<T>&& il )
-    : m_data( std::forward<std::initializer_list<T>>( il ) )
+    //! Constructor copies content of initializer_list
+    init_list( std::initializer_list<T> il )
+    : m_data( il )
     {}
+  
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
+    !defined(BOOST_TEST_ERRONEOUS_INIT_LIST)
+    //! Variadic template initialization
+    template <class ...Args>
+    init_list( Args&& ... args ) {
+      int dummy[] = { 0, (m_data.emplace_back(std::forward<Args&&>(args)), 0)... };
+      boost::ignore_unused(dummy);
+    }
+#endif
 
     //! dataset interface
     data::size_t    size() const    { return m_data.size(); }
@@ -50,7 +65,39 @@ public:
 
 private:
     // Data members
-    std::initializer_list<T> m_data;    
+    std::vector<T> m_data;
+};
+
+//! Specialization of init_list for type bool
+template <>
+class init_list<bool> {
+public:
+    typedef bool sample;
+
+    enum { arity = 1 };
+
+    typedef std::vector<bool>::const_iterator iterator;
+
+    //! Constructor copies content of initializer_list
+    init_list( std::initializer_list<bool>&& il )
+    : m_data( std::forward<std::initializer_list<bool>>( il ) )
+    {}
+  
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
+    !defined(BOOST_TEST_ERRONEOUS_INIT_LIST)
+    //! Variadic template initialization
+    template <class ...Args>
+    init_list( Args&& ... args ) : m_data{ args... }
+    { }
+#endif
+
+    //! dataset interface
+    data::size_t    size() const    { return m_data.size(); }
+    iterator        begin() const   { return m_data.begin(); }
+
+private:
+    // Data members
+    std::vector<bool> m_data;
 };
 
 //____________________________________________________________________________//
@@ -71,6 +118,20 @@ make( std::initializer_list<T>&& il )
     return monomorphic::init_list<T>( std::forward<std::initializer_list<T>>( il ) );
 }
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
+    !defined(BOOST_TEST_ERRONEOUS_INIT_LIST)
+template<class T, class ...Args>
+inline typename std::enable_if<
+  !monomorphic::has_dataset<T, Args...>::value,
+  monomorphic::init_list<T>
+>::type
+make( T&& arg0, Args&&... args )
+{
+    return monomorphic::init_list<T>( std::forward<T>(arg0), std::forward<Args>( args )... );
+}
+#endif
+
+
 } // namespace data
 } // namespace unit_test
 } // namespace boost