Wave: Merging from trunk

[SVN r85641]

doc/tuple.qbk

@@ -91,7 +91,7 @@ Where `Vi` is `X&` if the cv-unqualified type `Ti` is `reference_wrapper<X>`, ot
     template<typename T1, typename T2, ..., typename TN>
     tuple<T1&, T2&, ..., TN&> tie(T1& t1, T2& t2, ..., TN& tn);
 
-[*Returns]: tuple<T1&, T2&, ..., TN&>(t1, t2, ..., tN). When argument `ti` is `ignore`, assigning any value to the corresponding tuple element has has no effect.
+[*Returns]: tuple<T1&, T2&, ..., TN&>(t1, t2, ..., tN). When argument `ti` is `ignore`, assigning any value to the corresponding tuple element has no effect.
 
 [endsect]
 

include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp

@@ -8,6 +8,7 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_DEFINE_STRUCT_INLINE_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_DEFINE_STRUCT_INLINE_HPP
 
+#include <boost/config.hpp>
 #include <boost/fusion/support/category_of.hpp>
 #include <boost/fusion/sequence/sequence_facade.hpp>
 #include <boost/fusion/iterator/iterator_facade.hpp>
@@ -25,8 +26,32 @@
 #include <boost/preprocessor/seq/for_each_i.hpp>
 #include <boost/preprocessor/seq/size.hpp>
 #include <boost/preprocessor/seq/enum.hpp>
+#include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 
+// MSVC and GCC <= 4.4 have a bug that affects partial specializations of
+// nested templates under some circumstances. This affects the implementation
+// of BOOST_FUSION_DEFINE_STRUCT_INLINE, which uses such specializations for
+// the iterator class's 'deref' and 'value_of' metafunctions. On these compilers
+// an alternate implementation for these metafunctions is used that does not 
+// require such specializations. The alternate implementation takes longer
+// to compile so its use is restricted to the offending compilers.
+// For MSVC, the bug was reported at https://connect.microsoft.com/VisualStudio/feedback/details/757891/c-compiler-error-involving-partial-specializations-of-nested-templates
+// For GCC, 4.4 and earlier are no longer maintained so there is no need
+// to report a bug.
+#if defined(BOOST_MSVC) || (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)))
+    #define BOOST_FUSION_NEED_NESTED_TEMPLATE_PARTIAL_SPEC_WKND 
+#endif
+
+#ifdef BOOST_FUSION_NEED_NESTED_TEMPLATE_PARTIAL_SPEC_WKND
+#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/remove_const.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/fusion/sequence/intrinsic/at_c.hpp>
+#include <boost/fusion/container/vector.hpp>
+#endif
+
+
 #define BOOST_FUSION_MAKE_DEFAULT_INIT_LIST_ENTRY(R, DATA, N, ATTRIBUTE)        \
     BOOST_PP_COMMA_IF(N) BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE)()
 
@@ -148,6 +173,95 @@
 #define BOOST_FUSION_MAKE_DATA_MEMBER(R, DATA, N, ATTRIBUTE)                    \
     BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE) BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE);
 
+#ifdef BOOST_FUSION_NEED_NESTED_TEMPLATE_PARTIAL_SPEC_WKND
+
+#define BOOST_FUSION_DEFINE_ITERATOR_VALUE_OF(NAME, ATTRIBUTE_SEQ_SIZE)         \
+        template <typename boost_fusion_detail_Iterator>                        \
+        struct value_of : boost::fusion::result_of::at_c<                       \
+                              ref_vec_t,                                        \
+                              boost_fusion_detail_Iterator::index::value        \
+                          >                                                     \
+        {                                                                       \
+        };
+
+#define BOOST_FUSION_DEFINE_ITERATOR_DEREF(NAME, ATTRIBUTES_SEQ)                \
+        template <typename boost_fusion_detail_Iterator>                        \
+        struct deref                                                            \
+        {                                                                       \
+            typedef typename boost::remove_const<                               \
+                boost_fusion_detail_Iterator                                    \
+            >::type iterator_raw_type;                                          \
+                                                                                \
+            static const int index = iterator_raw_type::index::value;           \
+                                                                                \
+            typedef typename boost::fusion::result_of::at_c<                    \
+                ref_vec_t,                                                      \
+                index                                                           \
+            >::type result_raw_type;                                            \
+                                                                                \
+            typedef typename boost::mpl::if_<                                   \
+                boost::is_const<typename iterator_raw_type::sequence_type>,     \
+                typename boost::add_const<result_raw_type>::type,               \
+                result_raw_type                                                 \
+            >::type type;                                                       \
+                                                                                \
+            static type call(iterator_raw_type const& iter)                     \
+            {                                                                   \
+                return boost::fusion::at_c<index>(iter.ref_vec);                \
+            }                                                                   \
+        };
+
+#define BOOST_FUSION_MAKE_ITERATOR_WKND_FIELD_NAME(R, DATA, N, ATTRIBUTE)       \
+        BOOST_PP_COMMA_IF(N) seq.BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE)
+
+#define BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES(ATTRIBUTES_SEQ)     \
+        , ref_vec(BOOST_PP_SEQ_FOR_EACH_I(                                      \
+                          BOOST_FUSION_MAKE_ITERATOR_WKND_FIELD_NAME,           \
+                          ~,                                                    \
+                          BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ)))
+
+#define BOOST_FUSION_MAKE_ITERATOR_WKND_REF(Z, N, DATA)                         \
+        BOOST_PP_COMMA_IF(N)                                                    \
+        typename boost::mpl::if_<                                               \
+                boost::is_const<boost_fusion_detail_Seq>,                       \
+                typename boost::add_const<                                      \
+                        typename boost_fusion_detail_Seq::t##N##_type           \
+                >::type,                                                        \
+                typename boost_fusion_detail_Seq::t##N##_type                   \
+        >::type&
+
+#define BOOST_FUSION_DEFINE_ITERATOR_WKND_MEMBERS(ATTRIBUTES_SEQ_SIZE)          \
+        typedef boost::fusion::vector<                                          \
+            BOOST_PP_REPEAT(                                                    \
+                    ATTRIBUTES_SEQ_SIZE,                                        \
+                    BOOST_FUSION_MAKE_ITERATOR_WKND_REF,                        \
+                    ~)                                                          \
+        > ref_vec_t;                                                            \
+                                                                                \
+        ref_vec_t ref_vec;
+
+#else
+
+#define BOOST_FUSION_DEFINE_ITERATOR_VALUE_OF(NAME, ATTRIBUTES_SEQ_SIZE)        \
+        template <typename boost_fusion_detail_T> struct value_of;              \
+        BOOST_PP_REPEAT(                                                        \
+            ATTRIBUTES_SEQ_SIZE,                                                \
+            BOOST_FUSION_MAKE_ITERATOR_VALUE_OF_SPECS,                          \
+            NAME)
+
+#define BOOST_FUSION_DEFINE_ITERATOR_DEREF(NAME, ATTRIBUTES_SEQ)                \
+        template <typename boost_fusion_detail_T> struct deref;                 \
+        BOOST_PP_SEQ_FOR_EACH_I(                                                \
+            BOOST_FUSION_MAKE_ITERATOR_DEREF_SPECS,                             \
+            NAME,                                                               \
+            ATTRIBUTES_SEQ)
+
+#define BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES(ATTRIBUTES_SEQ)
+
+#define BOOST_FUSION_DEFINE_ITERATOR_WKND_MEMBERS(ATTRIBUTES_SEQ_SIZE)
+
+#endif  // BOOST_FUSION_NEED_NESTED_TEMPLATE_PARTIAL_SPEC_WKND
+
 // Note: We can't nest the iterator inside the struct because we run into
 //       a MSVC10 bug involving partial specializations of nested templates.
 
@@ -219,21 +333,18 @@
         typedef boost_fusion_detail_Seq sequence_type;                          \
                                                                                 \
         BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq)          \
-            : seq_(seq) {}                                                      \
+            : seq_(seq)                                                         \
+              BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES(              \
+                      (0)ATTRIBUTES_SEQ)                                        \
+        {}                                                                      \
                                                                                 \
         boost_fusion_detail_Seq& seq_;                                          \
                                                                                 \
-        template <typename boost_fusion_detail_T> struct value_of;              \
+        BOOST_FUSION_DEFINE_ITERATOR_WKND_MEMBERS(ATTRIBUTES_SEQ_SIZE)          \
-        BOOST_PP_REPEAT(                                                        \
-            ATTRIBUTES_SEQ_SIZE,                                                \
-            BOOST_FUSION_MAKE_ITERATOR_VALUE_OF_SPECS,                          \
-            NAME)                                                               \
                                                                                 \
-        template <typename boost_fusion_detail_T> struct deref;                 \
+        BOOST_FUSION_DEFINE_ITERATOR_VALUE_OF(NAME, ATTRIBUTES_SEQ_SIZE)        \
-        BOOST_PP_SEQ_FOR_EACH_I(                                                \
+                                                                                \
-            BOOST_FUSION_MAKE_ITERATOR_DEREF_SPECS,                             \
+        BOOST_FUSION_DEFINE_ITERATOR_DEREF(NAME, ATTRIBUTES_SEQ)                \
-            NAME,                                                               \
-            ATTRIBUTES_SEQ)                                                     \
                                                                                 \
         template <typename boost_fusion_detail_It>                              \
         struct next                                                             \

include/boost/fusion/container/deque/deque.hpp

@@ -11,7 +11,7 @@
 #include <boost/config.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
-// With variadics, we will use the PP version version
+// With variadics, we will use the PP version
 ///////////////////////////////////////////////////////////////////////////////
 #if defined(BOOST_NO_VARIADIC_TEMPLATES)
 # include <boost/fusion/container/deque/detail/pp_deque.hpp>

preprocess/preprocess.bat

@@ -1,7 +0,0 @@
-
-
-wave @wave.cfg -DFUSION_MAX_VECTOR_SIZE=10 -DFUSION_MAX_LIST_SIZE=10 -DFUSION_MAX_ZIP_SEQUENCES=10 preprocess.cpp
-wave @wave.cfg -DFUSION_MAX_VECTOR_SIZE=20 -DFUSION_MAX_LIST_SIZE=20 -DFUSION_MAX_ZIP_SEQUENCES=20 preprocess.cpp
-wave @wave.cfg -DFUSION_MAX_VECTOR_SIZE=30 -DFUSION_MAX_LIST_SIZE=30 -DFUSION_MAX_ZIP_SEQUENCES=30 preprocess.cpp
-wave @wave.cfg -DFUSION_MAX_VECTOR_SIZE=40 -DFUSION_MAX_LIST_SIZE=40 -DFUSION_MAX_ZIP_SEQUENCES=40 preprocess.cpp
-wave @wave.cfg -DFUSION_MAX_VECTOR_SIZE=50 -DFUSION_MAX_LIST_SIZE=50 -DFUSION_MAX_ZIP_SEQUENCES=50 preprocess.cpp

preprocess/preprocess.cpp

@@ -1,10 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2011 Joel de Guzman
-
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-==============================================================================*/
-#include <boost/fusion/container.hpp>
-#include <boost/fusion/algorithm.hpp>
-#include <boost/fusion/tuple.hpp>
-

preprocess/wave.cfg

@@ -1,14 +0,0 @@
--DBOOST_FUSION_DONT_USE_PREPROCESSED_FILES
--DBOOST_FUSION_CREATE_PREPROCESSED_FILES
--SC:/dev/boost
--SC:/dev/tools/mingw/include
--SC:/dev/tools/mingw/lib/gcc/mingw32/4.5.2/include
--SC:/dev/tools/mingw/lib/gcc/mingw32/4.5.2/include/c++
--SC:/dev/tools/mingw/lib/gcc/mingw32/4.5.2/include/c++/mingw32
---variadics
--NBOOST_FUSION_ADAPT_TPL_STRUCT_NO_PARTIAL
--NBOOST_PROTO_USE_GET_POINTER
--NBOOST_PROTO_GET_POINTER
---timer
-
-