Merge pull request #98 from Flast/bugfix/issue-11517

Fix #11517 (for master)

.travis.yml

@@ -1,225 +0,0 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright 2017-2018 Kohei Takahashi
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-language: cpp
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-env:
-  matrix:
-    - BOGUS_JOB=true
-
-matrix:
-
-  exclude:
-    - env: BOGUS_JOB=true
-
-  include:
-      # trusty default (gcc 4.8.4)
-    - os: linux
-      env: TOOLSET=gcc CXXSTD=03,11,1y
-
-    - os: linux
-      env: TOOLSET=gcc-4.4 CXXSTD=98,0x
-      addons:
-        apt:
-          packages:
-            - g++-4.4
-
-    - os: linux
-      env: TOOLSET=gcc-4.6 CXXSTD=03,0x
-      addons:
-        apt:
-          packages:
-            - g++-4.6
-
-    - os: linux
-      env: TOOLSET=gcc-4.7 CXXSTD=03,11
-      addons:
-        apt:
-          packages:
-            - g++-4.7
-
-    - os: linux
-      env: TOOLSET=gcc-4.8 CXXSTD=03,11,1y
-      addons:
-        apt:
-          packages:
-            - g++-4.8
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc-4.9 CXXSTD=03,11,1y
-      addons:
-        apt:
-          packages:
-            - g++-4.9
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc-5 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - g++-5
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc-6 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - g++-6
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc-7 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - g++-7
-          sources:
-            - ubuntu-toolchain-r-test
-
-      # trusty default (clang 3.9.0)
-    - os: linux
-      env: TOOLSET=clang CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=clang-3.5 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.5
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=clang-3.6 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - os: linux
-      env: TOOLSET=clang-3.7 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.7
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-
-    - os: linux
-      env: TOOLSET=clang-3.8 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=clang-3.9 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.9
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=clang-4.0 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-4.0
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-
-    - os: linux
-      env: TOOLSET=clang-5.0 CXXSTD=03,11,14,1z,2a
-      addons:
-        apt:
-          packages:
-            - clang-5.0
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-
-install:
-  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
-  - cd ..
-  - git clone --depth 1 -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root
-  - cd boost-root
-
-  - git submodule init libs/array
-  - git submodule init libs/assert
-  - git submodule init libs/bind
-  - git submodule init libs/concept_check
-  - git submodule init libs/config
-  - git submodule init libs/container_hash
-  - git submodule init libs/conversion
-  - git submodule init libs/core
-  - git submodule init libs/detail
-  - git submodule init libs/function
-  - git submodule init libs/function_types
-  - git submodule init libs/functional
-  - git submodule init libs/integer
-  - git submodule init libs/iterator
-  - git submodule init libs/lambda
-  - git submodule init libs/move
-  - git submodule init libs/mpl
-  - git submodule init libs/optional
-  - git submodule init libs/predef
-  - git submodule init libs/preprocessor
-  - git submodule init libs/smart_ptr
-  - git submodule init libs/static_assert
-  - git submodule init libs/throw_exception
-  - git submodule init libs/tuple
-  - git submodule init libs/type_index
-  - git submodule init libs/type_traits
-  - git submodule init libs/typeof
-  - git submodule init libs/utility
-
-  - git submodule init tools/build
-  - git submodule update
-
-  - rm -rf libs/fusion
-  - mv $TRAVIS_BUILD_DIR libs/fusion
-  - ln -s $(pwd)/libs/fusion $TRAVIS_BUILD_DIR
-
-  - ./bootstrap.sh
-  - ./b2 headers
-
-script:
-  - ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD

appveyor.yml

@@ -1,85 +0,0 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright 2017-2018 Kohei Takahashi
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-version: 1.0.{build}-{branch}
-
-shallow_clone: true
-
-environment:
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-9.0
-      CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-10.0
-      CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-11.0
-      CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-12.0
-      CXXSTD: latest # fake
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
-      CXXSTD: 14
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
-      CXXSTD: latest
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      CXXSTD: 14
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      CXXSTD: 17
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      CXXSTD: latest
-
-install:
-  - set BOOST_BRANCH=develop
-  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
-  - cd ..
-  - git clone --depth 1 -b %BOOST_BRANCH% https://github.com/boostorg/boost.git boost-root
-  - cd boost-root
-
-  - git submodule init libs/array
-  - git submodule init libs/assert
-  - git submodule init libs/bind
-  - git submodule init libs/concept_check
-  - git submodule init libs/config
-  - git submodule init libs/container_hash
-  - git submodule init libs/conversion
-  - git submodule init libs/core
-  - git submodule init libs/detail
-  - git submodule init libs/function
-  - git submodule init libs/function_types
-  - git submodule init libs/functional
-  - git submodule init libs/integer
-  - git submodule init libs/iterator
-  - git submodule init libs/lambda
-  - git submodule init libs/move
-  - git submodule init libs/mpl
-  - git submodule init libs/optional
-  - git submodule init libs/predef
-  - git submodule init libs/preprocessor
-  - git submodule init libs/smart_ptr
-  - git submodule init libs/static_assert
-  - git submodule init libs/throw_exception
-  - git submodule init libs/tuple
-  - git submodule init libs/type_index
-  - git submodule init libs/type_traits
-  - git submodule init libs/typeof
-  - git submodule init libs/utility
-
-  - git submodule init tools/build
-  - git submodule update
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\fusion
-  - cmd /c bootstrap
-  - b2 headers
-
-build: off
-
-test_script:
-  - b2 -j%NUMBER_OF_PROCESSORS% --hash libs/fusion/test toolset=%TOOLSET% cxxstd=%CXXSTD%

doc/Jamfile

@@ -25,8 +25,4 @@ boostbook quickbook
         <format>pdf:<xsl:param>img.src.path=$(images_location)/
     ;
 
-###############################################################################
-alias boostdoc ;
-explicit boostdoc ;
-alias boostrelease : quickbook ;
-explicit boostrelease ;
+

doc/adapted.qbk

@@ -227,7 +227,7 @@ __random_access_sequence__.
         struct_name,
         (member_type0, member_name0)
         (member_type1, member_name1)
-        (auto, member_name2)
+        (BOOST_FUSION_ADAPT_AUTO, member_name2)
         ...
         )
 
@@ -240,7 +240,7 @@ The sequence of `member_nameN,` arguments or  `(member_typeN, member_nameN)`
 pairs declares the type and names of each of the struct members that are part of
 the sequence. 
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macro should be used at global scope, and `struct_name` should be the fully
@@ -270,8 +270,8 @@ namespace qualified name of the struct to be adapted.
     // Without BOOST_PP_VARIADICS support :
     BOOST_FUSION_ADAPT_STRUCT(
         demo::employee,
-        (auto, name)
-        (auto, age)
+        (BOOST_FUSION_ADAPT_AUTO, name)
+        (BOOST_FUSION_ADAPT_AUTO, age)
     )
 
 [endsect]
@@ -298,7 +298,7 @@ __random_access_sequence__.
         (struct_name) (specialization_param0)(specialization_param1)...,
         (member_type0, member_name0)
         (member_type1, member_name1)
-        (auto, member_name2),
+        (BOOST_FUSION_ADAPT_AUTO, member_name2),
         ...
         )
 
@@ -316,7 +316,7 @@ The sequence of `member_nameN,` arguments or  `(member_typeN, member_nameN)`
 pairs declares the type and names of each of the struct members that are part of
 the sequence. 
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macro should be used at global scope, and `struct_name` should be the fully
@@ -345,7 +345,7 @@ namespace qualified name of the struct to be adapted.
         (demo::employee) (Name)(Age),
         (Name, name)
         (Age, age)
-        (auto, employment_timestamp))
+        (BOOST_FUSION_ADAPT_AUTO, employment_timestamp))
 
     // Or by infering type completely
     BOOST_FUSION_ADAPT_TPL_STRUCT(
@@ -390,7 +390,7 @@ adapted using the given name.
         struct_name, adapted_name,
         (member_type0, member_name0)
         (member_type1, member_name1)
-        (auto, member_name2),
+        (BOOST_FUSION_ADAPT_AUTO, member_name2),
         ...
         )
 
@@ -400,7 +400,7 @@ adapted using the given name.
         adapted_name,
         (member_type0, member_name0)
         (member_type1, member_name1)
-        (auto, member_name2),
+        (BOOST_FUSION_ADAPT_AUTO, member_name2),
         ...
         )
 
@@ -422,7 +422,7 @@ The sequence of `member_nameN,` arguments or  `(member_typeN, member_nameN)`
 pairs declares the type and names of each of the struct members that are part of
 the sequence. 
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macros should be used at global scope, and `struct_name` should be the fully
@@ -453,8 +453,8 @@ namespace qualified name of the struct to be converted.
     // Without BOOST_PP_VARIADICS support :
     BOOST_FUSION_ADAPT_STRUCT_NAMED(
         demo::employee, adapted_employee,
-        (auto, name),
-        (auto, age))
+        (BOOST_FUSION_ADAPT_AUTO, name),
+        (BOOST_FUSION_ADAPT_AUTO, age))
 
 [endsect]
 
@@ -481,7 +481,7 @@ The sequence of `([member_typeN,] member_nameN, key_typeN)` tuples
 declares the type, name and key type of each of the struct members 
 that are part of the sequence.
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macro should be used at global scope, and `struct_name` should be the fully
@@ -519,8 +519,8 @@ namespace qualified name of the struct to be adapted.
     // Without BOOST_PP_VARIADICS support :
     BOOST_FUSION_ADAPT_ASSOC_STRUCT(
         demo::employee,
-        (auto, name, keys::name),
-        (auto, age, keys::name))
+        (BOOST_FUSION_ADAPT_AUTO, name, keys::name),
+        (BOOST_FUSION_ADAPT_AUTO, age, keys::name))
 
 [endsect]
 
@@ -554,7 +554,7 @@ The sequence of `([member_typeN,] member_nameN, key_typeN)`
 tuples declares the type, name and key type of each of the struct members
 that are part of the sequence.
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macro should be used at global scope, and `struct_name` should be the fully
@@ -641,7 +641,7 @@ The sequence of `(member_typeN, member_nameN, key_typeN)`
 triples declares the type, name and key type of each of the struct members
 that are part of the sequence.
 
-When member_typeN is omitted or set to auto, the type is
+When member_typeN is omitted or set to BOOST_FUSION_ADAPT_AUTO, the type is
 infered with Boost.TypeOf.
 
 The macros should be used at global scope, and `struct_name` should be the fully
@@ -678,8 +678,8 @@ namespace qualified name of the struct to be converted.
     // Without BOOST_PP_VARIADICS support :
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED(
         demo::employee, adapted_employee,
-        (auto, name, keys::name)
-        (auto, age, keys::age))
+        (BOOST_FUSION_ADAPT_AUTO, name, keys::name)
+        (BOOST_FUSION_ADAPT_AUTO, age, keys::age))
 
 [endsect]
 
@@ -713,7 +713,7 @@ instance of `type_name`.
 [^attribute_type['N]] and [^attribute_const_type['N]] may specify the types
 that [^get_expr['N]] denotes to, when omitted the type is deduced from
 [get_expr['N]] return type via BOOST_TYPEOF. On compiler missing support for 
-variadic macros auto can be used to avoid repeating the type.
+variadic macros BOOST_FUSION_ADAPT_AUTO can be used to avoid repeating the type.
 [^set_expr['N]] is the expression that is invoked to set the ['N]th element
 of an instance of `type_name`. This expression may access variables named
 `obj` of type `type_name&`, which represent the corresponding instance of
@@ -823,7 +823,7 @@ instance of `type_name`.
 [^attribute_type['N]] and [^attribute_const_type['N]] may specify the types
 that [^get_expr['N]] denotes to, when omitted the type is deduced from
 [get_expr['N]] return type via BOOST_TYPEOF. On compiler missing support for 
-variadic macros auto can be used to avoid repeating the type.
+variadic macros BOOST_FUSION_ADAPT_AUTO can be used to avoid repeating the type.
 [^set_expr['N]] is the expression that is invoked to set the ['N]th element
 of an instance of `type_name`. This expression may access variables named
 `obj` of type `type_name&`, which represent the corresponding instance of
@@ -928,7 +928,7 @@ instance of `type_name`.
 [^attribute_type['N]] and [^attribute_const_type['N]] may specify the types
 that [^get_expr['N]] denotes to, when omitted the type is deduced from
 [get_expr['N]] return type via BOOST_TYPEOF. On compiler missing support for 
-variadic macros auto can be used to avoid repeating the type.
+variadic macros BOOST_FUSION_ADAPT_AUTO can be used to avoid repeating the type.
 [^set_expr['N]] is the expression that is invoked to set the ['N]th element
 of an instance of `type_name`. This expression may access variables named
 `obj` of type `type_name&`, which represent the corresponding instance of
@@ -1044,7 +1044,7 @@ instance of `type_name`.
 [^attribute_type['N]] and [^attribute_const_type['N]] may specify the types
 that [^get_expr['N]] denotes to, when omitted the type is deduced from
 [get_expr['N]] return type via BOOST_TYPEOF. On compiler missing support for 
-variadic macros auto can be used to avoid repeating the type.
+variadic macros BOOST_FUSION_ADAPT_AUTO can be used to avoid repeating the type.
 [^set_expr['N]] is the expression that is invoked to set the ['N]th element
 of an instance of `type_name`. This expression may access variables named
 `obj` of type `type_name&`, which represent the corresponding instance of

doc/algorithm.qbk

@@ -258,22 +258,6 @@ the first call) and [arg_desc] of `seq`.
     typename result_of_name_macro<Sequence const, State const, F>::type name_macro(
         Sequence const& seq, State const& initial_state, F f);
 
-    template<
-        typename Sequence,
-        typename State,
-        typename F
-        >
-    typename result_of_name_macro<Sequence, State, F>::type name_macro(
-        Sequence& seq, State& initial_state, F f);
-
-    template<
-        typename Sequence,
-        typename State,
-        typename F
-        >
-    typename result_of_name_macro<Sequence const, State, F>::type name_macro(
-        Sequence const& seq, State& initial_state, F f);
-
 [def seq_concept_macro [seq_concept]]
 [def arg_type_id_macro [arg_type_id]]
 [def arg_id_macro [arg_id]]
@@ -1738,7 +1722,7 @@ Takes 2 sequences and returns a sequence containing the elements of the first fo
     template<
         typename LhSequence,
         typename RhSequence>
-    typename __result_of_join__<LhSequence const, RhSequence const>::type join(LhSequence const& lhs, RhSequence const& rhs);
+    typename __result_of_join__<LhSequence, RhSequence>::type join(LhSequence const& lhs, RhSequence const& rhs);
 
 [table Parameters
     [[Parameter][Requirement][Description]]
@@ -1783,7 +1767,7 @@ Zips sequences together to form a single sequence, whose members are tuples of t
         ...
         typename SequenceN
         >
-    typename __result_of_zip__<Sequence1 const, Sequence2 const, ... SequenceN const>::type
+    typename __result_of_zip__<Sequence1, Sequence2, ... SequenceN>::type
     zip(Sequence1 const& seq1, Sequence2 const& seq2, ... SequenceN const& seqN);
 
 [table Parameters
@@ -1902,7 +1886,7 @@ Returns a new sequence with an element added at the end.
         typename Sequence,
         typename T
         >
-    typename __result_of_push_back__<Sequence const, T>::type push_back(
+    typename __result_of_push_back__<Sequence, T>::type push_back(
         Sequence const& seq, T const& t);
 
 [table Parameters
@@ -1943,7 +1927,7 @@ Returns a new sequence with an element added at the beginning.
         typename Sequence,
         typename T
         >
-    typename __result_of_push_front__<Sequence const, T>::type push_front(
+    typename __result_of_push_front__<Sequence, T>::type push_front(
         Sequence const& seq, T const& t);
 
 [table Parameters

doc/container.qbk

@@ -66,11 +66,6 @@ cases the most efficient.
     template <typename T0, typename T1, typename T2..., typename TN>
     struct vectorN;
 
-[important Numbered forms will be deprecated in C++11 and it will be provided
-           via aliasing templates. It means that your partial specialization
-           might be compile error. You can detect whether it is aliasing
-           templates or not, using `BOOST_FUSION_HAS_VARIADIC_VECTOR`.]
-
 [*Variadic form]
 
     template <
@@ -86,11 +81,9 @@ The numbered form accepts the exact number of elements. Example:
 
     vector3<int, char, double>
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the The variadic form accepts `0` to
-`FUSION_MAX_VECTOR_SIZE` elements, where `FUSION_MAX_VECTOR_SIZE` is a
-user definable predefined maximum that defaults to `10`. Example:
+The variadic form accepts `0` to `FUSION_MAX_VECTOR_SIZE` elements, where
+`FUSION_MAX_VECTOR_SIZE` is a user definable predefined maximum that
+defaults to `10`. Example:
 
     vector<int, char, double>
 
@@ -239,11 +232,9 @@ each element is peculiarly constant (see __recursive_inline__).
     >
     struct list;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic class interface accepts `0` to
-`FUSION_MAX_LIST_SIZE` elements, where `FUSION_MAX_LIST_SIZE` is a user
-definable predefined maximum that defaults to `10`. Example:
+The variadic class interface accepts `0` to `FUSION_MAX_LIST_SIZE`
+elements, where `FUSION_MAX_LIST_SIZE` is a user definable predefined
+maximum that defaults to `10`. Example:
 
     list<int, char, double>
 
@@ -541,11 +532,9 @@ complexity (see __overloaded_functions__).
     >
     struct set;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic class interface accepts `0` to
-`FUSION_MAX_SET_SIZE` elements, where `FUSION_MAX_SET_SIZE` is a user
-definable predefined maximum that defaults to `10`. Example:
+The variadic class interface accepts `0` to `FUSION_MAX_SET_SIZE` elements,
+where `FUSION_MAX_SET_SIZE` is a user definable predefined maximum that
+defaults to `10`. Example:
 
     set<int, char, double>
 
@@ -625,11 +614,9 @@ __overloaded_functions__).
     >
     struct map;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic class interface accepts `0` to
-`FUSION_MAX_MAP_SIZE` elements, where `FUSION_MAX_MAP_SIZE` is a user
-definable predefined maximum that defaults to `10`. Example:
+The variadic class interface accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
+where `FUSION_MAX_MAP_SIZE` is a user definable predefined maximum that
+defaults to `10`. Example:
 
     map<__pair__<int, char>, __pair__<char, char>, __pair__<double, char> >
 
@@ -710,13 +697,10 @@ Create a __list__ from one or more values.
     typename __result_of_make_list__<T0, T1,... TN>::type
     make_list(T0 const& x0, T1 const& x1... TN const& xN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_LIST_SIZE` elements, where `FUSION_MAX_LIST_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_LIST_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_LIST_SIZE` elements, where
+`FUSION_MAX_LIST_SIZE` is a user definable predefined maximum that defaults
+to `10`. You may define the preprocessor constant `FUSION_MAX_LIST_SIZE`
+before including any Fusion header to change the default. Example:
 
     #define FUSION_MAX_LIST_SIZE 20
 
@@ -810,13 +794,11 @@ Create a __vector__ from one or more values.
     typename __result_of_make_vector__<T0, T1,... TN>::type
     make_vector(T0 const& x0, T1 const& x1... TN const& xN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_VECTOR_SIZE` elements, where `FUSION_MAX_VECTOR_SIZE` is a
-user definable predefined maximum that defaults to `10`. You may define
-the preprocessor constant `FUSION_MAX_VECTOR_SIZE` before including any
-Fusion header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_VECTOR_SIZE` elements,
+where `FUSION_MAX_VECTOR_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_VECTOR_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_VECTOR_SIZE 20
 
@@ -914,13 +896,11 @@ Create a __set__ from one or more values.
     typename __result_of_make_set__<T0, T1,... TN>::type
     make_set(T0 const& x0, T1 const& x1... TN const& xN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_SET_SIZE` elements, where `FUSION_MAX_SET_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_SET_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_SET_SIZE` elements,
+where `FUSION_MAX_SET_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_SET_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_SET_SIZE 20
 
@@ -1069,13 +1049,10 @@ Constructs a tie using a __list__ sequence.
     __list__<T0&, T1&,... TN&>
     list_tie(T0& x0, T1& x1... TN& xN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_LIST_SIZE` elements, where `FUSION_MAX_LIST_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_LIST_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_LIST_SIZE` elements, where
+`FUSION_MAX_LIST_SIZE` is a user definable predefined maximum that defaults
+to `10`. You may define the preprocessor constant `FUSION_MAX_LIST_SIZE`
+before including any Fusion header to change the default. Example:
 
     #define FUSION_MAX_LIST_SIZE 20
 
@@ -1119,13 +1096,11 @@ Constructs a tie using a __vector__ sequence.
     __vector__<T0&, T1&,... TN&>
     vector_tie(T0& x0, T1& x1... TN& xN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_VECTOR_SIZE` elements, where `FUSION_MAX_VECTOR_SIZE` is a
-user definable predefined maximum that defaults to `10`. You may define
-the preprocessor constant `FUSION_MAX_VECTOR_SIZE` before including any
-Fusion header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_VECTOR_SIZE` elements,
+where `FUSION_MAX_VECTOR_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_VECTOR_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_VECTOR_SIZE 20
 
@@ -1169,14 +1144,11 @@ Constructs a tie using a __map__ sequence.
     __map__<__pair__<K0, D0&>, __pair__<K1, D1&>,... __pair__<KN, DN&> >
     map_tie(D0& d0, D1& d1... DN& dN);
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_MAP_SIZE` elements, where `FUSION_MAX_MAP_SIZE` is a user
-definable predefined maximum that defaults to `10`, and a corresponding
-number of key types.  You may define the preprocessor constant
-`FUSION_MAX_MAP_SIZE` before including any Fusion header to change the
-default. Example:
+The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
+where `FUSION_MAX_MAP_SIZE` is a user definable predefined maximum that
+defaults to `10`, and a corresponding number of key types.
+You may define the preprocessor constant  `FUSION_MAX_MAP_SIZE` before
+including any Fusion header to change the default. Example:
 
     #define FUSION_MAX_MAP_SIZE 20
 
@@ -1277,13 +1249,10 @@ Returns the result type of __make_list__.
     template <typename T0, typename T1,... typename TN>
     struct make_list;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_LIST_SIZE` elements, where `FUSION_MAX_LIST_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_LIST_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_LIST_SIZE` elements, where
+`FUSION_MAX_LIST_SIZE` is a user definable predefined maximum that defaults
+to `10`. You may define the preprocessor constant `FUSION_MAX_LIST_SIZE`
+before including any Fusion header to change the default. Example:
 
     #define FUSION_MAX_LIST_SIZE 20
 
@@ -1364,13 +1333,11 @@ Returns the result type of __make_vector__.
     template <typename T0, typename T1,... typename TN>
     struct make_vector;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_VECTOR_SIZE` elements, where `FUSION_MAX_VECTOR_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_VECTOR_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_VECTOR_SIZE` elements,
+where `FUSION_MAX_VECTOR_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_VECTOR_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_VECTOR_SIZE 20
 
@@ -1460,13 +1427,11 @@ Returns the result type of __make_set__.
     template <typename T0, typename T1,... typename TN>
     struct make_set;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_SET_SIZE` elements, where `FUSION_MAX_SET_SIZE` is a user definable
-predefined maximum that defaults to `10`. You may define the preprocessor
-constant `FUSION_MAX_SET_SIZE` before including any Fusion header to change
-the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_SET_SIZE` elements,
+where `FUSION_MAX_SET_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_SET_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_SET_SIZE 20
 
@@ -1594,13 +1559,10 @@ Returns the result type of __list_tie__.
     template <typename T0, typename T1,... typename TN>
     struct list_tie;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_LIST_SIZE` elements, where `FUSION_MAX_LIST_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_LIST_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_LIST_SIZE` elements, where
+`FUSION_MAX_LIST_SIZE` is a user definable predefined maximum that defaults
+to `10`. You may define the preprocessor constant `FUSION_MAX_LIST_SIZE`
+before including any Fusion header to change the default. Example:
 
     #define FUSION_MAX_LIST_SIZE 20
 
@@ -1641,13 +1603,11 @@ Returns the result type of __vector_tie__.
     template <typename T0, typename T1,... typename TN>
     struct vector_tie;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_VECTOR_SIZE` elements, where `FUSION_MAX_VECTOR_SIZE` is a user
-definable predefined maximum that defaults to `10`. You may define the
-preprocessor constant `FUSION_MAX_VECTOR_SIZE` before including any Fusion
-header to change the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_VECTOR_SIZE` elements,
+where `FUSION_MAX_VECTOR_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_VECTOR_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_VECTOR_SIZE 20
 
@@ -1735,13 +1695,11 @@ Returns the result type of __map_tie__.
     template <typename K0, typename K1,... typename KN, typename D0, typename D1,... typename DN>
     struct map_tie;
 
-For C++11 compilers, the variadic function interface has no upper bound.
-
-For C++03 compilers, the variadic function accepts `0` to
-`FUSION_MAX_MAP_SIZE` elements, where `FUSION_MAX_MAP_SIZE` is a user definable
-predefined maximum that defaults to `10`. You may define the preprocessor
-constant `FUSION_MAX_MAP_SIZE` before including any Fusion header to change
-the default. Example:
+The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
+where `FUSION_MAX_MAP_SIZE` is a user definable predefined maximum that
+defaults to `10`. You may define the preprocessor constant
+`FUSION_MAX_MAP_SIZE` before including any Fusion header to change the
+default. Example:
 
     #define FUSION_MAX_MAP_SIZE 20
 

doc/fusion.qbk

@@ -2,7 +2,6 @@
     Copyright (C) 2001-2011 Joel de Guzman
     Copyright (C) 2006 Dan Marsden
     Copyright (C) 2010 Christopher Schmidt
-    Copyright (C) 2018 Kohei Takahashi
 
     Use, modification and distribution is subject to the Boost Software
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -21,37 +20,39 @@
     ]
 ]
 
-[def __spirit__                 [@http://boost-spirit.com/home/ Spirit]]
-[def __phoenix__                [@http://www.boost.org/libs/phoenix Phoenix]]
-[def __mpl__                    [@http://www.boost.org/libs/mpl MPL]]
+[def __spirit__                 [@http://spirit.sourceforge.net Spirit]]
+[def __phoenix__                [@http://www.boost.org/libs/phoenix/index.html Phoenix]]
+[def __mpl__                    [@http://www.boost.org/libs/mpl/index.html MPL]]
 [def __stl__                    [@http://en.wikipedia.org/wiki/Standard_Template_Library STL]]
-[def __tuple__                  [@http://www.boost.org/libs/tuple Boost.Tuple]]
+[def __tuple__                  [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple]]
 [def __tr1__tuple__             [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf TR1 Tuple]]
 [def __boost_tools__            [@http://www.boost.org/tools/index.html Boost Tools]]
-[def __spirit_list__            [@https://sourceforge.net/projects/spirit/lists/spirit-general Spirit Mailing List]]
-[def __list_archive__           [@https://sourceforge.net/p/spirit/mailman/spirit-general/ archive]]
+[def __spirit_list__            [@https://lists.sourceforge.net/lists/listinfo/spirit-general Spirit Mailing List]]
+[def __spirit_general__         [@news://news.gmane.org/gmane.comp.spirit.general Spirit General NNTP news portal]]
+[def __gmane__                  [@http://www.gmane.org Gmane]]
+[def __mlist_archive__          [@http://news.gmane.org/gmane.comp.parsers.spirit.general]]
 [def __jaakko_jarvi__           [@http://www.boost.org/people/jaakko_jarvi.htm Jaakko Jarvi]]
 [def __david_abrahams__         [@http://www.boost.org/people/dave_abrahams.htm David Abrahams]]
 [def __the_forwarding_problem__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm The Forwarding Problem]]
 
-[def __boost_any__              [@http://www.boost.org/libs/any Boost.Any Library]]
+[def __boost_any__              [@http://www.boost.org/doc/html/any.html Boost.Any]]
 [def __new_iterator_concepts__  [@http://www.boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts]]
-[def __boost_array_library__    [@http://www.boost.org/libs/array Boost.Array Library]]
-[def __boost_variant_library__  [@http://www.boost.org/libs/variant Boost.Variant Library]]
-[def __boost_tuple_library__    [@http://www.boost.org/libs/tuple Boost.Tuple Library]]
-[def __boost_ref__              [@http://www.boost.org/libs/core/ref.html Ref utility]]
-[def __boost_ref_call__         [@http://www.boost.org/libs/core/ref.html `ref`]]
-[def __boost_result_of__        [@http://www.boost.org/libs/utility/utility.htm#result_of ResultOf utility]]
+[def __boost_array_library__    [@http://www.boost.org/doc/html/array.html Boost.Array Library]]
+[def __boost_variant_library__  [@http://www.boost.org/doc/html/variant.html Boost.Variant Library]]
+[def __boost_tuple_library__    [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple Library]]
+[def __boost_ref__              [@http://www.boost.org/doc/html/ref.html Boost.Ref]]
+[def __boost_ref_call__         [@http://www.boost.org/doc/html/ref.html `ref`]]
+[def __boost_result_of__        [@http://www.boost.org/libs/utility/utility.htm#result_of Boost.ResultOf]]
 [def __boost_result_of_call__   [@http://www.boost.org/libs/utility/utility.htm#result_of `boost::result_of`]]
-[def __boost_enable_if__        [@http://www.boost.org/libs/core/doc/html/core/enable_if.html EnableIf utility]]
-[def __boost_shared_ptr_call__  [@http://www.boost.org/libs/smart_ptr#shared_ptr `boost::shared_ptr`]]
-[def __boost_func_forward__     [@http://www.boost.org/libs/functional/forward Boost.Functional/Forward Library]]
-[def __boost_func_factory__     [@http://www.boost.org/libs/functional/factory Boost.Functional/Factory Library]]
-[def __boost_func_hash__        [@http://www.boost.org/doc/html/hash.html Boost.ContainerHash Library]]
-[def __std_pair_doc__           [@http://en.cppreference.com/w/cpp/utility/pair `std::pair`]]
+[def __boost_enable_if__        [@http://www.boost.org/libs/utility/enable_if.html Boost.EnableIf utility]]
+[def __boost_shared_ptr_call__  [@http://www.boost.org/libs/smart_ptr/shared_ptr.htm `boost::shared_ptr`]]
+[def __boost_func_forward__     [@http://www.boost.org/libs/functional/forward/doc/html/index.html Boost.Functional/Forward]]
+[def __boost_func_factory__     [@http://www.boost.org/libs/functional/factory/doc/html/index.html Boost.Functional/Factory]]
+[def __boost_func_hash__        [@http://www.boost.org/doc/html/hash.html Boost.Functional/Hash]]
+[def __std_pair_doc__           [@http://www.sgi.com/tech/stl/pair.html `std::pair`]]
 [def __std_tuple_doc__          [@http://en.cppreference.com/w/cpp/utility/tuple `std::tuple`]]
-[def __std_plus_doc__           [@http://en.cppreference.com/w/cpp/utility/functional/plus `std::plus`]]
-[def __std_minus_doc__          [@http://en.cppreference.com/w/cpp/utility/functional/minus `std::minus`]]
+[def __std_plus_doc__           [@http://www.sgi.com/tech/stl/plus.html `std::plus`]]
+[def __std_minus_doc__          [@http://www.sgi.com/tech/stl/minus.html `std::minus`]]
 
 [def __mpl_integral_constant__  [@http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html MPL Integral Constant]]
 [def __mpl_boolean_constant__   [@http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html MPL Boolean Constant]]

doc/preface.qbk

@@ -61,8 +61,11 @@ tool. QuickBook can be found in the __boost_tools__.
 [heading Support]
 
 Please direct all questions to Spirit's mailing list. You can subscribe to the
-__spirit_list__. The mailing list has a searchable archive. Here is a link to
-the archives: __list_archive__.
+__spirit_list__. The mailing list has a searchable archive. A search link to
+this archive is provided in __spirit__'s home page. You may also read and post
+messages to the mailing list through __spirit_general__ (thanks to __gmane__).
+The news group mirrors the mailing list. Here is a link to the archives:
+__mlist_archive__.
 
 [endsect]
 

doc/references.qbk

@@ -1,7 +1,6 @@
 [/==============================================================================
     Copyright (C) 2001-2011 Joel de Guzman
     Copyright (C) 2006 Dan Marsden
-    Copyright (C) 2018 Kohei Takahashi
 
     Use, modification and distribution is subject to the Boost Software
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,20 +8,20 @@
 ===============================================================================/]
 [section References]
 
-# [@http://www.boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts],
+# [@http://boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts],
   David Abrahams, Jeremy Siek, Thomas Witt, 2004-11-01.
-# [@http://www.boost.org/libs/tuple The Boost Tuple Library],
+# [@http://boost.org/libs/tuple/doc/tuple_users_guide.html The Boost Tuple Library],
   Jaakko Jarvi, 2001.
-# [@http://www.boost.org/libs/spirit Spirit Parser Library],
+# [@http://www.boost.org/libs/spirit/ Spirit Parser Library],
   Joel de Guzman, 2001-2006.
-# [@http://www.boost.org/libs/mpl The Boost MPL Library],
+# [@http://www.boost.org/libs/mpl/ The Boost MPL Library],
   Aleksey Gurtovoy and David Abrahams, 2002-2004.
-# [@http://www.boost.org/libs/array The Boost Array Library],
+# [@http://www.boost.org/doc/html/array.html Boost Array],
   Nicolai Josuttis, 2002-2004.
-# [@http://www.boost.org/libs/core/ref.html Boost.Core / Ref utility],
+# [@http://www.sgi.com/tech/stl/ Standard Template Library Programmer's Guide],
+  Hewlett-Packard Company, 1994.
+# [@http://www.boost.org/doc/html/ref.html Boost.Ref],
   Jaakko Jarvi, Peter Dimov, Douglas Gregor, Dave Abrahams, 1999-2002.
-# [@http://www.boost.org/libs/hana The Boost Hana Library],
-  Louis Dionne, 2017.
 
 [endsect]
 

include/boost/fusion/adapted/adt/adapt_adt.hpp

@@ -15,6 +15,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
 #include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
@@ -44,11 +45,13 @@
             TEMPLATE_PARAMS_SEQ,                                                \
             NAME_SEQ,                                                           \
             I,                                                                  \
-            BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),   \
+            BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),    \
             BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE),                      \
             BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE),                 \
-            BOOST_PP_LESS(                                                      \
-                BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), 4))         \
+            BOOST_PP_IF(                                                        \
+                BOOST_PP_LESS(                                                  \
+                    BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), 4)      \
+                , 1, 0))    
 
 #define BOOST_FUSION_ADAPT_TPL_ADT(TEMPLATE_PARAMS_SEQ, NAME_SEQ , ATTRIBUTES)  \
     BOOST_FUSION_ADAPT_STRUCT_BASE(                                             \

include/boost/fusion/adapted/adt/adapt_assoc_adt.hpp

@@ -14,7 +14,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
@@ -46,11 +46,13 @@
             TEMPLATE_PARAMS_SEQ,                                                \
             NAME_SEQ,                                                           \
             I,                                                                  \
-            BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),   \
+            BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),    \
             BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE),                      \
             BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE),                 \
-            BOOST_PP_LESS(                                                      \
-                BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), 5))         \
+            BOOST_PP_IF(                                                        \
+                BOOST_PP_LESS(                                                  \
+                    BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), 5)      \
+                , 1, 0))                                                        \
                                                                                 \
     template<                                                                   \
         BOOST_FUSION_ADAPT_STRUCT_UNPACK_TEMPLATE_PARAMS(TEMPLATE_PARAMS_SEQ)   \

include/boost/fusion/adapted/adt/detail/adapt_base.hpp

@@ -15,10 +15,8 @@
 #include <boost/fusion/adapted/struct/detail/adapt_is_tpl.hpp>
 
 #include <boost/preprocessor/control/if.hpp>
-#include <boost/preprocessor/control/expr_if.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_const.hpp>
@@ -38,18 +36,18 @@
     boost::remove_const<boost::remove_reference<lvalue>::type>::type
 
 #define BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_GETEXPR(ATTRIBUTE,                     \
-    ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE)                                          \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,                                   \
+    ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE)                                          \
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,                                   \
         BOOST_PP_IF(DEDUCE_TYPE, 0, 2), ATTRIBUTE)
 
 #define BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_SETEXPR(ATTRIBUTE,                     \
-    ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE)                                          \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,                                   \
+    ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE)                                          \
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,                                   \
         BOOST_PP_IF(DEDUCE_TYPE, 1, 3), ATTRIBUTE)
 
 #ifdef BOOST_MSVC
 #   define BOOST_FUSION_DEDUCED_ATTR_TYPE(NAME_SEQ, ATTRIBUTE,                  \
-        ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)                      \
+        ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)                      \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_MSVC_REDEFINE_TEMPLATE_PARAMS(                    \
         TEMPLATE_PARAMS_SEQ)                                                    \
@@ -57,57 +55,52 @@
     struct deduced_attr_type {                                                  \
       static const BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj;        \
       typedef                                                                   \
-          BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),      \
-                           typename)                                            \
+          BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),typename,) \
           BOOST_TYPEOF( PREFIX() BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_GETEXPR(      \
-              ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, 1)) type;                        \
+              ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, 1)) type;                        \
     };
 
 #else
 #   define BOOST_FUSION_DEDUCED_ATTR_TYPE(NAME_SEQ, ATTRIBUTE,                  \
-        ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)                      \
+        ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)                      \
     struct deduced_attr_type {                                                  \
       static const BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj;        \
       typedef BOOST_TYPEOF( PREFIX() BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_GETEXPR(  \
-                      ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, 1)) type;                \
+                      ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, 1)) type;                \
     };
 
 #endif
 
 #define BOOST_FUSION_ADT_ATTRIBUTE_TYPEOF(                                      \
-    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
+    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
                                                                                 \
     BOOST_FUSION_DEDUCED_ATTR_TYPE(                                             \
-        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
+        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
                                                                                 \
     typedef                                                                     \
-        BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),        \
-                         typename)                                              \
+        BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),typename,)   \
         boost::remove_const<                                                    \
-          BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),      \
-                           typename) \
+          BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),typename,) \
           deduced_attr_type::type                                               \
         >::type type;                                                           \
                                                                                 \
     typedef                                                                     \
-        BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),        \
-                         typename)   \
+        BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),typename,)   \
         boost::add_const<                                                       \
-          BOOST_PP_EXPR_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),      \
-                           typename) \
+          BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ),typename,) \
           deduced_attr_type::type                                               \
     >::type const_type;
 
 #define BOOST_FUSION_ADT_ATTRIBUTE_GIVENTYPE(                                   \
-    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
+    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
                                                                                 \
-    typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE, 0, ATTRIBUTE) type;       \
-    typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE, 1, ATTRIBUTE) const_type;
+    typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE) type;       \
+    typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 1, ATTRIBUTE) const_type;
 
 
 #define BOOST_FUSION_ADAPT_ADT_C_BASE(                                          \
     TEMPLATE_PARAMS_SEQ,NAME_SEQ,I,PREFIX,                                      \
-    ATTRIBUTE,ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE)                                \
+    ATTRIBUTE,ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE)                                \
                                                                                 \
     template<                                                                   \
         BOOST_FUSION_ADAPT_STRUCT_UNPACK_TEMPLATE_PARAMS(TEMPLATE_PARAMS_SEQ)   \
@@ -123,7 +116,7 @@
             BOOST_FUSION_ADT_ATTRIBUTE_GIVENTYPE)(                              \
                 NAME_SEQ,                                                       \
                 ATTRIBUTE,                                                      \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 PREFIX,                                                         \
                 TEMPLATE_PARAMS_SEQ)                                            \
                                                                                 \
@@ -135,7 +128,7 @@
             Val const& val)                                                     \
         {                                                                       \
            PREFIX() BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_SETEXPR(ATTRIBUTE,         \
-                ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE);                             \
+                ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE);                             \
         }                                                                       \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                                \
@@ -144,7 +137,7 @@
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj)               \
         {                                                                       \
             return PREFIX() BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_GETEXPR(ATTRIBUTE, \
-                ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE);                             \
+                ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE);                             \
         }                                                                       \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                                \
@@ -153,7 +146,7 @@
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ) const& obj)         \
         {                                                                       \
             return PREFIX() BOOST_FUSION_ADAPT_ADT_ATTRIBUTE_GETEXPR(ATTRIBUTE, \
-                ATTRIBUTE_TUPLE_SIZE, DEDUCE_TYPE);                             \
+                ATTRIBUTE_TUPEL_SIZE, DEDUCE_TYPE);                             \
         }                                                                       \
     };                                                                          \
                                                                                 \
@@ -167,7 +160,7 @@
     >                                                                           \
     {                                                                           \
         typedef                                                                 \
-            BOOST_PP_EXPR_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ), typename)  \
+            BOOST_PP_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ), typename, )     \
             access::adt_attribute_access<                                       \
                 BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)                 \
               , I                                                               \
@@ -208,7 +201,7 @@
     >                                                                           \
     {                                                                           \
         typedef                                                                 \
-            BOOST_PP_EXPR_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ), typename)  \
+            BOOST_PP_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ), typename, )     \
             access::adt_attribute_access<                                       \
                 BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)                 \
               , I                                                               \
@@ -259,8 +252,7 @@
       , I                                                                       \
     >                                                                           \
     {                                                                           \
-        typedef BOOST_PP_EXPR_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ),        \
-                                 typename)                                      \
+        typedef BOOST_PP_IF(BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ), typename, ) \
             adt_attribute_proxy<                                                \
                           BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)       \
                         , I                                                     \

include/boost/fusion/adapted/adt/detail/adapt_base_assoc_attr_filler.hpp

@@ -10,15 +10,12 @@
 
 #include <boost/config.hpp>
 
-#include <boost/fusion/adapted/struct/detail/adapt_auto.hpp>
 #include <boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp>
 
-#include <boost/mpl/aux_/preprocessor/token_equal.hpp>
-
-#include <boost/preprocessor/config/config.hpp>
-#include <boost/preprocessor/control/iif.hpp>
+#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
-#include <boost/preprocessor/arithmetic/dec.hpp>
+#include <boost/preprocessor/empty.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
 
 #if BOOST_PP_VARIADICS
 
@@ -44,7 +41,7 @@
     BOOST_FUSION_ADAPT_ASSOC_ADT_FILLER_0
 
 #define BOOST_FUSION_ADAPT_ASSOC_ADT_WRAP_ATTR(A, B, C, D, E)                   \
-    BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A),                             \
+    BOOST_PP_IF(BOOST_PP_IS_EMPTY(A),                                           \
         ((3, (C,D,E))),                                                         \
         ((5, (A,B,C,D,E)))                                                      \
     )
@@ -58,7 +55,7 @@
 #define BOOST_FUSION_ADAPT_ASSOC_ADT_WRAPPEDATTR_GET_KEY(ATTRIBUTE)             \
     BOOST_PP_TUPLE_ELEM(                                                        \
         BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE),                     \
-        BOOST_PP_DEC(BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE)),       \
+        BOOST_PP_SUB(BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE), 1),    \
         BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR(ATTRIBUTE))
 
 #endif

include/boost/fusion/adapted/adt/detail/adapt_base_attr_filler.hpp

@@ -9,22 +9,24 @@
 #define BOOST_FUSION_ADAPTED_ADT_DETAIL_ADAPT_BASE_ATTR_FILLER_HPP
 
 #include <boost/config.hpp>
-
-#include <boost/fusion/adapted/struct/detail/adapt_auto.hpp>
 #include <boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp>
 
-#include <boost/mpl/aux_/preprocessor/token_equal.hpp>
-
-#include <boost/preprocessor/arithmetic/dec.hpp>
-#include <boost/preprocessor/control/iif.hpp>
+#include <boost/preprocessor/arithmetic/sub.hpp>
+#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/logical/or.hpp>
+#include <boost/preprocessor/empty.hpp>
+#include <boost/preprocessor/tuple/size.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
 #include <boost/preprocessor/variadic/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
+#include <boost/preprocessor/variadic/to_tuple.hpp>
 #include <boost/preprocessor/variadic/elem.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
+#include <boost/preprocessor/seq/for_each.hpp>
+#include <boost/preprocessor/seq/push_front.hpp>
 #include <boost/preprocessor/seq/rest_n.hpp>
 
+#include <boost/preprocessor/tuple/reverse.hpp>
+
 
 #define BOOST_FUSION_ADAPT_ADT_WRAPPEDATTR_SIZE(ATTRIBUTE)                      \
   BOOST_PP_TUPLE_ELEM(2, 0, ATTRIBUTE)
@@ -45,15 +47,11 @@
 #  define BOOST_FUSION_ADAPT_ADT_FILLER_0_END
 #  define BOOST_FUSION_ADAPT_ADT_FILLER_1_END
 
-// MSVC don't compile when using BOOST_PP_BITOR instead of BOOST_PP_OR.
 #  define BOOST_FUSION_ADAPT_ADT_FILLER(...)                                    \
-      BOOST_PP_IIF(                                                             \
+      BOOST_PP_IF(                                                              \
           BOOST_PP_OR(                                                          \
-              BOOST_MPL_PP_TOKEN_EQUAL(auto,                                    \
-                  BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)),                      \
-              BOOST_MPL_PP_TOKEN_EQUAL(auto,                                    \
-                  BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__))),                     \
-                                                                                \
+              BOOST_PP_IS_EMPTY(BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)),        \
+              BOOST_PP_IS_EMPTY(BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__))),       \
           BOOST_FUSION_ADAPT_ADT_WRAP_ATTR(                                     \
               BOOST_PP_VARIADIC_ELEM(2, __VA_ARGS__),                           \
               BOOST_FUSION_WORKAROUND_VARIADIC_EMPTINESS_LAST_ELEM(__VA_ARGS__) \
@@ -65,7 +63,7 @@
 
 #  define BOOST_FUSION_WORKAROUND_VARIADIC_EMPTINESS_LAST_ELEM(...)             \
   BOOST_PP_SEQ_HEAD(BOOST_PP_SEQ_REST_N(                                        \
-            BOOST_PP_DEC(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__)),                  \
+            BOOST_PP_SUB(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), 1),               \
         BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)))
 
 #else // BOOST_PP_VARIADICS
@@ -82,7 +80,7 @@
 #  define BOOST_FUSION_ADAPT_ADT_FILLER_1_END
 
 #  define BOOST_FUSION_ADAPT_ADT_WRAP_ATTR(A, B, C, D)                          \
-      BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, A),                           \
+      BOOST_PP_IF(BOOST_PP_IS_EMPTY(A),                                         \
         ((2, (C,D))),                                                           \
         ((4, (A,B,C,D)))                                                        \
       )

include/boost/fusion/adapted/std_array.hpp

@@ -1,23 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY__01062013_1700)
-#define BOOST_FUSION_STD_ARRAY__01062013_1700
-
-#include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
-#include <boost/fusion/adapted/std_array/tag_of.hpp>
-#include <boost/fusion/adapted/std_array/detail/is_view_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/category_of_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/begin_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/end_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/size_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/at_impl.hpp>
-#include <boost/fusion/adapted/std_array/detail/value_at_impl.hpp>
-
-#endif

include/boost/fusion/adapted/std_array/detail/array_size.hpp

@@ -1,25 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700
-
-#include <cstddef>
-#include <boost/type_traits/integral_constant.hpp>
-
-namespace boost { namespace fusion
-{
-    namespace extension
-    {
-        template<class T>
-        struct std_array_size;
-
-        template<template<typename, std::size_t> class Array, typename T, std::size_t N>
-        struct std_array_size<Array<T, N> > : boost::integral_constant<std::size_t, N> {};
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/at_impl.hpp

@@ -1,45 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700
-
-#include <boost/type_traits/is_const.hpp>
-
-#include <boost/mpl/if.hpp>
-
-namespace boost { namespace fusion {
-    
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename T>
-        struct at_impl;
-
-        template<>
-        struct at_impl<std_array_tag>
-        {
-            template<typename Sequence, typename N>
-            struct apply
-            {
-                typedef typename mpl::if_<
-                    is_const<Sequence>, 
-                    typename Sequence::const_reference, 
-                    typename Sequence::reference>::type type;
-
-                static type
-                call(Sequence& seq)
-                {
-                    return seq[N::value];
-                }
-            };
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/begin_impl.hpp

@@ -1,41 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700
-
-#include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
-
-namespace boost { namespace fusion {
-
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename T>
-        struct begin_impl;
-
-        template <>
-        struct begin_impl<std_array_tag>
-        {
-            template <typename Sequence>
-            struct apply 
-            {
-                typedef std_array_iterator<Sequence, 0> type;
-           
-                static type
-                call(Sequence& v)
-                {
-                    return type(v);
-                }
-            };
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp

@@ -1,35 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700
-
-#include <boost/config/no_tr1/utility.hpp>
-
-namespace boost { namespace fusion { 
-
-    struct std_array_tag;
-    struct random_access_traversal_tag;
-
-    namespace extension
-    {
-        template<typename T>
-        struct category_of_impl;
-
-        template<>
-        struct category_of_impl<std_array_tag>
-        {
-            template<typename T>
-            struct apply
-            {
-                typedef random_access_traversal_tag type;
-            };
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/end_impl.hpp

@@ -1,45 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700
-
-#include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
-#include <boost/fusion/adapted/std_array/detail/array_size.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
-namespace boost { namespace fusion {
-
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template <typename Tag>
-        struct end_impl;
-
-        template <>
-        struct end_impl<std_array_tag>
-        {
-            template <typename Sequence>
-            struct apply 
-            {
-                typedef typename remove_const<Sequence>::type seq_type;
-                static int const size = std_array_size<seq_type>::value;
-                typedef std_array_iterator<Sequence, size> type;
-
-                static type
-                call(Sequence& v)
-                {
-                    return type(v);
-                }
-            };
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp

@@ -1,32 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700
-
-#include <boost/mpl/bool.hpp>
-
-namespace boost { namespace fusion {
-
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename Tag>
-        struct is_sequence_impl;
-
-        template<>
-        struct is_sequence_impl<std_array_tag>
-        {
-            template<typename Sequence>
-            struct apply : mpl::true_ {};
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp

@@ -1,33 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700
-
-#include <boost/mpl/bool.hpp>
-
-namespace boost { namespace fusion 
-{
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename Tag>
-        struct is_view_impl;
-
-        template<>
-        struct is_view_impl<std_array_tag>
-        {
-            template<typename T>
-            struct apply : mpl::false_
-            {};
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/size_impl.hpp

@@ -1,41 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700
-
-#include <boost/fusion/adapted/std_array/detail/array_size.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
-namespace boost { namespace fusion {
-
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename T>
-        struct size_impl;
-
-        template<>
-        struct size_impl<std_array_tag>
-        {
-            template<typename Sequence>
-            struct apply
-                : mpl::int_
-                    <
-                        std_array_size
-                        <
-                            typename remove_const<Sequence>::type
-                        >::value
-                    >
-            {};
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp

@@ -1,32 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700
-
-namespace boost { namespace fusion {
-    
-    struct std_array_tag;
-
-    namespace extension
-    {
-        template<typename T>
-        struct value_at_impl;
-
-        template <>
-        struct value_at_impl<std_array_tag>
-        {
-            template <typename Sequence, typename N>
-            struct apply 
-            {
-                typedef typename Sequence::value_type type;
-            };
-        };
-    }
-}}
-
-#endif

include/boost/fusion/adapted/std_array/std_array_iterator.hpp

@@ -1,109 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2013 Mateusz Loskot
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700
-
-#include <cstddef>
-#include <boost/config.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/minus.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/adapted/std_array/detail/array_size.hpp>
-
-namespace boost { namespace fusion
-{
-    struct random_access_traversal_tag;
-
-    template <typename Array, int Pos>
-    struct std_array_iterator
-        : iterator_facade<std_array_iterator<Array, Pos>, random_access_traversal_tag>
-    {
-        BOOST_MPL_ASSERT_RELATION(Pos, >=, 0);
-        BOOST_MPL_ASSERT_RELATION(Pos, <=, std::tuple_size<Array>::value);
-
-        typedef mpl::int_<Pos> index;
-        typedef Array array_type;
-
-        std_array_iterator(Array& a)
-            : array(a) {}
-
-        Array& array;
-
-        template <typename Iterator>
-        struct value_of
-        {
-            typedef typename Iterator::array_type array_type;
-            typedef typename array_type::value_type type;
-        };
-
-        template <typename Iterator>
-        struct deref
-        {
-            typedef typename Iterator::array_type array_type;
-            typedef typename 
-                mpl::if_<
-                    is_const<array_type>
-                  , typename array_type::const_reference
-                  , typename array_type::reference
-                >::type 
-            type;
-
-            static type
-            call(Iterator const & it)
-            {
-                return it.array[Iterator::index::value];
-            }
-        };
-
-        template <typename Iterator, typename N>
-        struct advance
-        {
-            typedef typename Iterator::index index;
-            typedef typename Iterator::array_type array_type;
-            typedef std_array_iterator<array_type, index::value + N::value> type;
-
-            static type
-            call(Iterator const& i)
-            {
-                return type(i.array);
-            }
-        };
-
-        template <typename Iterator>
-        struct next : advance<Iterator, mpl::int_<1> > {};
-
-        template <typename Iterator>
-        struct prior : advance<Iterator, mpl::int_<-1> > {};
-
-        template <typename I1, typename I2>
-        struct distance : mpl::minus<typename I2::index, typename I1::index>
-        {
-            typedef typename
-                mpl::minus<
-                    typename I2::index, typename I1::index
-                >::type 
-            type;
-
-            static type
-            call(I1 const&, I2 const&)
-            {
-                return type();
-            }
-        };
-
-    private:
-
-        std_array_iterator<Array, Pos>& operator=(std_array_iterator<Array, Pos> const&);
-    };
-}}
-
-#endif

include/boost/fusion/adapted/std_array/tag_of.hpp

@@ -1,52 +0,0 @@
-/*=============================================================================
-    Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2005-2006 Dan Marsden
-
-    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)
-==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700)
-#define BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700
-
-#include <boost/fusion/support/tag_of_fwd.hpp>
-#include <array>
-#include <cstddef>
-
-namespace boost { namespace fusion
-{
-    struct std_array_tag;
-    struct fusion_sequence_tag;
-
-    namespace traits
-    {
-        template<typename T, std::size_t N>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
-        struct tag_of<std::array<T,N>, void >
-#else
-        struct tag_of<std::array<T,N> >
-#endif
-        {
-            typedef std_array_tag type;
-        };
-    }
-}}
-
-namespace boost { namespace mpl
-{
-    template<typename>
-    struct sequence_tag;
-
-    template<typename T, std::size_t N>
-    struct sequence_tag<std::array<T,N> >
-    {
-        typedef fusion::fusion_sequence_tag type;
-    };
-
-    template<typename T, std::size_t N>
-    struct sequence_tag<std::array<T,N> const>
-    {
-        typedef fusion::fusion_sequence_tag type;
-    };
-}}
-
-#endif

include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp

@@ -13,8 +13,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/comparison/less.hpp>
+#include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_const.hpp>
@@ -45,11 +44,11 @@
         NAME_SEQ,                                                               \
         IS_VIEW,                                                                \
         I,                                                                      \
-        BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),       \
+        PREFIX,                                                                 \
         BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE),                       \
         BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE),                  \
-        BOOST_PP_LESS(                                                          \
-            BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE),3))           \
+        BOOST_PP_IF(BOOST_PP_LESS(                                              \
+            BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE),3), 1, 0))    \
                                                                                 \
     template<                                                                   \
         BOOST_FUSION_ADAPT_STRUCT_UNPACK_TEMPLATE_PARAMS(TEMPLATE_PARAMS_SEQ)   \

include/boost/fusion/adapted/struct/adapt_assoc_struct_named.hpp

@@ -12,6 +12,13 @@
 #include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/proxy_type.hpp>
 
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0(X, Y, Z)                 \
+    (X, obj.Y, Z) BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1(X, Y, Z)                 \
+    (X, obj.Y, Z) BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0_END
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_1_END
+
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_NS(                               \
     WRAPPED_TYPE, NAMESPACE_SEQ, NAME, ATTRIBUTES)                              \
                                                                                 \
@@ -20,7 +27,9 @@
                                                                                 \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_AS_VIEW(                                    \
         BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DECLARATION((0)NAMESPACE_SEQ)NAME,  \
-        ATTRIBUTES)
+        BOOST_PP_CAT(                                                           \
+            BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_FILLER_0 ATTRIBUTES,          \
+            _END))
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED(WRAPPED_TYPE, NAME, ATTRIBUTES)   \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_NAMED_NS(                                   \

include/boost/fusion/adapted/struct/adapt_struct.hpp

@@ -14,8 +14,9 @@
 #include <boost/preprocessor/config/config.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/control/iif.hpp>
+#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
+#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/type_traits/add_reference.hpp>
@@ -44,11 +45,13 @@
             NAME_SEQ,                                                           \
             IS_VIEW,                                                            \
             I,                                                                  \
-            BOOST_PP_IIF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),   \
+            BOOST_PP_IF(IS_VIEW, BOOST_FUSION_PROXY_PREFIX, BOOST_PP_EMPTY),    \
             BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE),                   \
             BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE),              \
-            BOOST_PP_LESS(                                                      \
-                BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), 2))
+            BOOST_PP_IF(                                                        \
+                BOOST_PP_LESS(                                                  \
+                    BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), 2)   \
+                , 1, 0))
 
 
 
@@ -83,7 +86,7 @@
             BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(                        \
               BOOST_PP_SEQ_TAIL(BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__))),        \
             BOOST_FUSION_ADAPT_STRUCT_C)
-
+        
 #else // BOOST_PP_VARIADICS
 
 #   define BOOST_FUSION_ADAPT_TPL_STRUCT(                                       \

include/boost/fusion/adapted/struct/adapt_struct_named.hpp

@@ -13,7 +13,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/proxy_type.hpp>
-#include <boost/preprocessor/config/config.hpp>
+#include <boost/preprocessor/empty.hpp>
 
 #ifdef BOOST_PP_VARIADICS
 

include/boost/fusion/adapted/struct/define_assoc_struct.hpp

@@ -11,7 +11,6 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/define_struct.hpp>
-#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_FUSION_DEFINE_ASSOC_STRUCT_FILLER_0(X, Y, Z)                      \
     ((X, Y, Z)) BOOST_FUSION_DEFINE_ASSOC_STRUCT_FILLER_1

include/boost/fusion/adapted/struct/define_struct.hpp

@@ -11,7 +11,6 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/adapted/struct/detail/define_struct.hpp>
-#include <boost/preprocessor/cat.hpp>
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT(                                         \
     TEMPLATE_PARAMS_SEQ, NAMESPACE_SEQ, NAME, ATTRIBUTES)                       \

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

@@ -8,7 +8,8 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_AUTO_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_AUTO_HPP
 
-#define BOOST_FUSION_ADAPT_AUTO auto 
-#define BOOST_MPL_PP_TOKEN_EQUAL_auto(x) x
+#include <boost/preprocessor/empty.hpp>
+
+#define BOOST_FUSION_ADAPT_AUTO BOOST_PP_EMPTY()
 
 #endif

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

@@ -29,7 +29,6 @@
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/comparison/less.hpp>
-#include <boost/preprocessor/logical/not.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/tag.hpp>
 #include <boost/mpl/eval_if.hpp>
@@ -65,7 +64,7 @@
 
 #ifdef BOOST_MSVC
 #   define BOOST_FUSION_ATTRIBUTE_TYPEOF(                                       \
-        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
+        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_MSVC_REDEFINE_TEMPLATE_PARAMS(                    \
         TEMPLATE_PARAMS_SEQ)                                                    \
@@ -74,7 +73,7 @@
       static const BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj;        \
       typedef                                                                   \
       BOOST_PP_IF(BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ), typename, )   \
-      BOOST_TYPEOF( PREFIX() obj.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,      \
+      BOOST_TYPEOF( PREFIX() obj.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,      \
             0, ATTRIBUTE))                                                      \
       type;                                                                     \
     };                                                                          \
@@ -85,12 +84,12 @@
 
 #else 
 #   define BOOST_FUSION_ATTRIBUTE_TYPEOF(                                       \
-        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
+        NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ) \
                                                                                 \
     struct deduced_attr_type {                                                  \
       static const BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj;        \
       typedef BOOST_TYPEOF(                                                     \
-          PREFIX() obj.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE, 0, ATTRIBUTE)) \
+          PREFIX() obj.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE)) \
       type;                                                                     \
     };                                                                          \
                                                                                 \
@@ -101,9 +100,9 @@
 #endif
 
 #define BOOST_FUSION_ATTRIBUTE_GIVENTYPE(                                       \
-    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPLE_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
+    NAME_SEQ, ATTRIBUTE, ATTRIBUTE_TUPEL_SIZE, PREFIX, TEMPLATE_PARAMS_SEQ)     \
     typedef                                                                     \
-        BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE, 0, ATTRIBUTE) attribute_type;
+        BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE) attribute_type;
    
 
 #ifdef BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS
@@ -160,7 +159,7 @@
 
 #define BOOST_FUSION_ADAPT_STRUCT_C_BASE(                                       \
     TEMPLATE_PARAMS_SEQ,NAME_SEQ,IS_VIEW,                                       \
-    I,PREFIX,ATTRIBUTE,ATTRIBUTE_TUPLE_SIZE,                                    \
+    I,PREFIX,ATTRIBUTE,ATTRIBUTE_TUPEL_SIZE,                                    \
     DEDUCE_TYPE)                                                                \
                                                                                 \
     template<                                                                   \
@@ -175,7 +174,7 @@
             BOOST_FUSION_ATTRIBUTE_TYPEOF, BOOST_FUSION_ATTRIBUTE_GIVENTYPE)(   \
                 NAME_SEQ,                                                       \
                 ATTRIBUTE,                                                      \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 PREFIX,                                                         \
                 TEMPLATE_PARAMS_SEQ)                                            \
                                                                                 \
@@ -202,8 +201,8 @@
             call(Seq& seq)                                                      \
             {                                                                   \
                 return seq.PREFIX()                                             \
-                    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,                   \
-                        BOOST_PP_NOT(DEDUCE_TYPE), ATTRIBUTE);                  \
+                    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,                   \
+                        BOOST_PP_IF(DEDUCE_TYPE, 0, 1), ATTRIBUTE);             \
             }                                                                   \
         };                                                                      \
     };                                                                          \
@@ -223,8 +222,9 @@
         call()                                                                  \
         {                                                                       \
             return BOOST_PP_STRINGIZE(                                          \
-               BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,                        \
-                   BOOST_PP_NOT(DEDUCE_TYPE), ATTRIBUTE));                      \
+               BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,                        \
+                        BOOST_PP_IF(DEDUCE_TYPE, 0, 1),                         \
+                          ATTRIBUTE));                                          \
         }                                                                       \
     };
 
@@ -274,7 +274,7 @@ namespace boost
             struct struct_is_view<                                              \
                 BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)                 \
             >                                                                   \
-              : mpl::BOOST_PP_IIF(IS_VIEW,true_,false_)                         \
+              : mpl::BOOST_PP_IF(IS_VIEW,true_,false_)                          \
             {};                                                                 \
         }                                                                       \
     }                                                                           \

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

@@ -10,16 +10,13 @@
 
 #include <boost/config.hpp>
 
-#include <boost/fusion/adapted/struct/detail/adapt_auto.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp>
 
-#include <boost/mpl/aux_/preprocessor/token_equal.hpp>
-
-#include <boost/preprocessor/config/config.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/arithmetic/dec.hpp>
+#include <boost/preprocessor/control/if.hpp>
+#include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/variadic/size.hpp>
-#include <boost/preprocessor/variadic/elem.hpp>
+#include <boost/preprocessor/empty.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
 
 #if BOOST_PP_VARIADICS
 
@@ -32,14 +29,7 @@
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(...)                          \
-  BOOST_PP_IIF(                                                                 \
-      BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__)),   \
-      ((2,                                                                      \
-          (BOOST_PP_VARIADIC_ELEM(1, __VA_ARGS__),                              \
-           BOOST_PP_VARIADIC_ELEM(2, __VA_ARGS__)))),                           \
-      ((BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),                                    \
-          (__VA_ARGS__)))                                                       \
-    )
+      ((BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), (__VA_ARGS__)))
 
 #else // BOOST_PP_VARIADICS
 
@@ -53,7 +43,7 @@
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z)                      \
-    BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, X),                             \
+    BOOST_PP_IF(BOOST_PP_IS_EMPTY(X),                                           \
       ((2, (Y,Z))),                                                             \
       ((3, (X,Y,Z)))                                                            \
     )
@@ -67,7 +57,7 @@
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAPPEDATTR_GET_KEY(ATTRIBUTE)          \
     BOOST_PP_TUPLE_ELEM(                                                        \
         BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE),                  \
-        BOOST_PP_DEC(BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE)),    \
+        BOOST_PP_SUB(BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR_SIZE(ATTRIBUTE), 1), \
         BOOST_FUSION_ADAPT_STRUCT_WRAPPEDATTR(ATTRIBUTE))
 
 #endif

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

@@ -9,21 +9,15 @@
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_BASE_ATTR_FILLER_HPP
 
 #include <boost/config.hpp>
-
-#include <boost/fusion/adapted/struct/detail/adapt_auto.hpp>
 #include <boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp>
 
-#include <boost/mpl/aux_/preprocessor/token_equal.hpp>
-
-#include <boost/preprocessor/config/config.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/logical/compl.hpp>
+#include <boost/preprocessor/empty.hpp>
+#include <boost/preprocessor/tuple/size.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
+#include <boost/preprocessor/variadic/to_seq.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/push_front.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/facilities/is_empty.hpp>
 
 
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_0(X, Y)                                \
@@ -38,7 +32,7 @@
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END
 
 #define BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X, Y)                               \
-    BOOST_PP_IIF(BOOST_MPL_PP_TOKEN_EQUAL(auto, BOOST_PP_EXPAND(X)),            \
+    BOOST_PP_IF(BOOST_PP_IS_EMPTY(X),                                           \
       ((1, (Y))),                                                               \
       ((2, (X,Y)))                                                              \
     )
@@ -53,10 +47,12 @@
 #if BOOST_PP_VARIADICS
 
 #   define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER_OP(r, unused, elem)      \
-        BOOST_PP_IIF(BOOST_FUSION_PP_IS_SEQ(elem),                              \
-            BOOST_PP_CAT(BOOST_FUSION_ADAPT_STRUCT_FILLER_0 elem ,_END),        \
-            BOOST_PP_EXPR_IIF(BOOST_PP_COMPL(BOOST_PP_IS_EMPTY(elem)),          \
-                BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(auto, elem)))
+        BOOST_PP_IF(BOOST_FUSION_PP_IS_SEQ(elem),                               \
+            BOOST_PP_CAT( BOOST_FUSION_ADAPT_STRUCT_FILLER_0 elem ,_END),       \
+            BOOST_PP_IF(BOOST_PP_IS_EMPTY(elem),                                \
+              BOOST_PP_EMPTY(),                                                 \
+              BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(BOOST_FUSION_ADAPT_AUTO,elem))\
+            )
 
 #   define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(VA_ARGS_SEQ)             \
         BOOST_PP_SEQ_PUSH_FRONT(                                                \

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

@@ -8,8 +8,6 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_IS_TPL_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_ADAPT_IS_TPL_HPP
 
-#include <boost/preprocessor/seq/seq.hpp>
-
 #define BOOST_FUSION_ADAPT_IS_TPL(TEMPLATE_PARAMS_SEQ)                          \
     BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ)
 

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

@@ -10,18 +10,19 @@
 
 #include <boost/fusion/support/config.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/adapted/struct/detail/adapt_base.hpp>
 #include <boost/fusion/adapted/struct/detail/namespace.hpp>
+#include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/if.hpp>
 #include <boost/preprocessor/expr_if.hpp>
 #include <boost/preprocessor/dec.hpp>
 #include <boost/preprocessor/logical/not.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/seq/seq.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
@@ -40,65 +41,15 @@
 #define BOOST_FUSION_DEFINE_STRUCT_FILLER_0_END
 #define BOOST_FUSION_DEFINE_STRUCT_FILLER_1_END
 
-#ifdef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
 #define BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR_FILLER_I(                          \
-    R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                      \
+    R, ATTRIBUTE_TUPEL_SIZE, I, ATTRIBUTE)                                      \
                                                                                 \
     BOOST_PP_COMMA_IF(I)                                                        \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)(                      \
-        other_self.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE))
-
-#define BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR(                                   \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED                                                    \
-    NAME(self_type const& other_self)                                           \
-      : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
-            1,                                                                  \
-            BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR_FILLER_I,                      \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
-            ATTRIBUTES_SEQ)                                                     \
-    {}
-
-// Use templated version instead.
-#define BOOST_FUSION_DEFINE_STRUCT_COPY_ASSIGN_FILLER_I(                        \
-    R, ATTRIBUTE_TUPLE_SIZE, I_, ATTRIBUTE)                                     \
-                                                                                \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)=                      \
-        other.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE);
-
-#define BOOST_FUSION_DEFINE_STRUCT_COPY_ASSIGN_OP(                              \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED                                                    \
-    self_type& operator=(self_type const& other)                                \
-    {                                                                           \
-        BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
-            1,                                                                  \
-            BOOST_FUSION_DEFINE_STRUCT_COPY_ASSIGN_FILLER_I,                    \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
-            ATTRIBUTES_SEQ)                                                     \
-                                                                                \
-        return *this;                                                           \
-    }
-
-#else // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
-#define BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR(                                   \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED NAME(self_type const&) = default;
-
-#define BOOST_FUSION_DEFINE_STRUCT_COPY_ASSIGN_OP(                              \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED self_type& operator=(self_type const&) = default;
-
-#endif // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)(                      \
+        other_self.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE))
 
 #define BOOST_FUSION_DEFINE_STRUCT_ASSIGN_FILLER_I(                             \
-    R, ATTRIBUTE_TUPLE_SIZE, I_, ATTRIBUTE)                                     \
+    R, ATTRIBUTE_TUPEL_SIZE, I_, ATTRIBUTE)                                     \
                                                                                 \
     BOOST_PP_EXPR_IF(                                                           \
         I_,                                                                     \
@@ -111,11 +62,11 @@
                 boost::fusion::next(BOOST_PP_CAT(i,BOOST_PP_DEC(I_)));          \
     )                                                                           \
                                                                                 \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)=                      \
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)=                      \
         boost::fusion::deref(BOOST_PP_CAT(i,I_));
 
 #define BOOST_FUSION_DEFINE_STRUCT_ASSIGN_OP(                                   \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
+    ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                       \
                                                                                 \
     template<typename Seq>                                                      \
     BOOST_FUSION_GPU_ENABLED                                                    \
@@ -130,126 +81,51 @@
         BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
             1,                                                                  \
             BOOST_FUSION_DEFINE_STRUCT_ASSIGN_FILLER_I,                         \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
+            ATTRIBUTE_TUPEL_SIZE,                                               \
             ATTRIBUTES_SEQ)                                                     \
                                                                                 \
         return *this;                                                           \
     }
 
-#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR(NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_OP(ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
-
-#else // BOOST_NO_CXX11_RVALUE_REFERENCES
-
-#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) \
- || BOOST_WORKAROUND(BOOST_GCC, < 40500) \
- || BOOST_WORKAROUND(BOOST_MSVC, == 1800)
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR_FILLER_I(                          \
-    R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                      \
+#define BOOST_FUSION_DEFINE_STRUCT_ATTR_I(R, ATTRIBUTE_TUPEL_SIZE, ATTRIBUTE)   \
                                                                                 \
-    BOOST_PP_COMMA_IF(I)                                                        \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)(std::move(            \
-        other_self.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)))
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR(                                   \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED                                                    \
-    NAME(self_type&& other_self)                                                \
-      : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
-            1,                                                                  \
-            BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR_FILLER_I,                      \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
-            ATTRIBUTES_SEQ)                                                     \
-    {}
-
-#else // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR(                                   \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED NAME(self_type&&) = default;
-
-#endif // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
-#if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) \
- || BOOST_WORKAROUND(BOOST_GCC, < 40600) \
- || BOOST_WORKAROUND(BOOST_MSVC, == 1800)
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_FILLER_I(                        \
-    R, ATTRIBUTE_TUPLE_SIZE, I_, ATTRIBUTE)                                     \
-                                                                                \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)=std::move(            \
-        other.BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE));
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_OP(                              \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED                                                    \
-    self_type& operator=(self_type&& other)                                     \
-    {                                                                           \
-        BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
-            1,                                                                  \
-            BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_FILLER_I,                    \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
-            ATTRIBUTES_SEQ)                                                     \
-                                                                                \
-        return *this;                                                           \
-    }
-
-#else // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
-#define BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_OP(                              \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
-                                                                                \
-    BOOST_FUSION_GPU_ENABLED self_type& operator=(self_type&&) = default;
-
-#endif // BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
-
-#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
-
-#define BOOST_FUSION_DEFINE_STRUCT_ATTR_I(R, ATTRIBUTE_TUPLE_SIZE, ATTRIBUTE)   \
-                                                                                \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,0,ATTRIBUTE)                       \
-        BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE);
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,0,ATTRIBUTE)                       \
+        BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE);
 
 #define BOOST_FUSION_DEFINE_STRUCT_SEQ_CTOR_FILLER_I(                           \
-    R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                      \
+    R, ATTRIBUTE_TUPEL_SIZE, I, ATTRIBUTE)                                      \
                                                                                 \
     BOOST_PP_COMMA_IF(I)                                                        \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)(                      \
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)(                      \
         boost::fusion::deref(boost::fusion::advance_c<I>(boost::fusion::begin(  \
             seq))))
 
 #define BOOST_FUSION_DEFINE_STRUCT_SEQ_CTOR_DISABLER(                           \
-    ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                       \
+    ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                       \
                                                                                 \
     , typename boost::disable_if<                                               \
         boost::is_convertible<                                                  \
             Seq const&                                                          \
           , BOOST_PP_TUPLE_ELEM(                                                \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 0,                                                              \
                 BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))                              \
         >                                                                       \
     >::type* =0
 
 #define BOOST_FUSION_DEFINE_STRUCT_SEQ_DEFAULT_CTOR_FILLER_I(                   \
-    R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                      \
+    R, ATTRIBUTE_TUPEL_SIZE, I, ATTRIBUTE)                                      \
                                                                                 \
     BOOST_PP_COMMA_IF(I)                                                        \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)()
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)()
 
 #define BOOST_FUSION_DEFINE_STRUCT_IMPL_IMPL(                                   \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
+    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
     BOOST_PP_SEQ_FOR_EACH_R(                                                    \
         1,                                                                      \
         BOOST_FUSION_DEFINE_STRUCT_ATTR_I,                                      \
-        ATTRIBUTE_TUPLE_SIZE,                                                   \
+        ATTRIBUTE_TUPEL_SIZE,                                                   \
         ATTRIBUTES_SEQ)                                                         \
                                                                                 \
     BOOST_FUSION_GPU_ENABLED                                                    \
@@ -257,14 +133,18 @@
       : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
             1,                                                                  \
             BOOST_FUSION_DEFINE_STRUCT_SEQ_DEFAULT_CTOR_FILLER_I,               \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
+            ATTRIBUTE_TUPEL_SIZE,                                               \
             ATTRIBUTES_SEQ)                                                     \
     {}                                                                          \
                                                                                 \
-    BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR(                                       \
-        NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)  \
-    BOOST_FUSION_DEFINE_STRUCT_MOVE_CTOR(                                       \
-        NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)  \
+    BOOST_FUSION_GPU_ENABLED                                                    \
+    NAME(self_type const& other_self)                                           \
+      : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
+            1,                                                                  \
+            BOOST_FUSION_DEFINE_STRUCT_COPY_CTOR_FILLER_I,                      \
+            ATTRIBUTE_TUPEL_SIZE,                                               \
+            ATTRIBUTES_SEQ)                                                     \
+    {}                                                                          \
                                                                                 \
     template<typename Seq>                                                      \
     BOOST_FUSION_GPU_ENABLED                                                    \
@@ -273,57 +153,53 @@
             BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),                    \
             BOOST_PP_TUPLE_EAT(2),                                              \
             BOOST_FUSION_DEFINE_STRUCT_SEQ_CTOR_DISABLER)(                      \
-                ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                           \
+                ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                           \
         )                                                                       \
       : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
             1,                                                                  \
             BOOST_FUSION_DEFINE_STRUCT_SEQ_CTOR_FILLER_I,                       \
-            ATTRIBUTE_TUPLE_SIZE,                                               \
+            ATTRIBUTE_TUPEL_SIZE,                                               \
             ATTRIBUTES_SEQ)                                                     \
     {}                                                                          \
                                                                                 \
-    BOOST_FUSION_DEFINE_STRUCT_COPY_ASSIGN_OP(                                  \
-        ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                   \
-    BOOST_FUSION_DEFINE_STRUCT_MOVE_ASSIGN_OP(                                  \
-        ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                   \
-    BOOST_FUSION_DEFINE_STRUCT_ASSIGN_OP(ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
+    BOOST_FUSION_DEFINE_STRUCT_ASSIGN_OP(ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_1(                                      \
-        NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                             \
+        NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                             \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                                \
         explicit                                                                \
         NAME(boost::call_traits<                                                \
                 BOOST_PP_TUPLE_ELEM(                                            \
-                    ATTRIBUTE_TUPLE_SIZE,0,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))   \
+                    ATTRIBUTE_TUPEL_SIZE,0,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))   \
             >::param_type arg)                                                  \
           : BOOST_PP_TUPLE_ELEM(                                                \
-                ATTRIBUTE_TUPLE_SIZE,1,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))(arg)  \
+                ATTRIBUTE_TUPEL_SIZE,1,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))(arg)  \
         {}
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1(                                  \
-        TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)        \
+        TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)        \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                                \
         explicit                                                                \
         NAME(typename boost::call_traits<                                       \
                 typename boost::fusion::detail::get_first_arg<                  \
                     BOOST_PP_TUPLE_ELEM(                                        \
-                        ATTRIBUTE_TUPLE_SIZE,                                   \
+                        ATTRIBUTE_TUPEL_SIZE,                                   \
                         0,                                                      \
                         BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))                      \
                   , BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ)                      \
                 >::type                                                         \
             >::param_type arg)                                                  \
           : BOOST_PP_TUPLE_ELEM(                                                \
-                ATTRIBUTE_TUPLE_SIZE,1,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))(arg)  \
+                ATTRIBUTE_TUPEL_SIZE,1,BOOST_PP_SEQ_HEAD(ATTRIBUTES_SEQ))(arg)  \
         {}
 
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_FILLER_I(                               \
-    R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                      \
+    R, ATTRIBUTE_TUPEL_SIZE, I, ATTRIBUTE)                                      \
                                                                                 \
     BOOST_PP_COMMA_IF(I)                                                        \
-    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,1,ATTRIBUTE)(BOOST_PP_CAT(_,I))
+    BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)(BOOST_PP_CAT(_,I))
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I(R, DATA, I, ATTRIBUTE)        \
                                                                                 \
@@ -339,14 +215,14 @@
         >::param_type BOOST_PP_CAT(_,I)
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N(                                  \
-    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)            \
+    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)            \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                                \
         NAME(BOOST_PP_SEQ_FOR_EACH_I_R(                                         \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I,                      \
                 (                                                               \
-                    ATTRIBUTE_TUPLE_SIZE,                                       \
+                    ATTRIBUTE_TUPEL_SIZE,                                       \
                     BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ),                          \
                     BOOST_PP_SEQ_HEAD(TEMPLATE_PARAMS_SEQ)                      \
                 ),                                                              \
@@ -354,64 +230,77 @@
           : BOOST_PP_SEQ_FOR_EACH_I_R(                                          \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_STRUCT_CTOR_FILLER_I,                       \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 ATTRIBUTES_SEQ)                                                 \
         {}
 
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I(                                  \
-        R, ATTRIBUTE_TUPLE_SIZE, I, ATTRIBUTE)                                  \
+        R, ATTRIBUTE_TUPEL_SIZE, I, ATTRIBUTE)                                  \
                                                                                 \
         BOOST_PP_COMMA_IF(I)                                                    \
         boost::call_traits<                                                     \
-            BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPLE_SIZE,0,ATTRIBUTE)               \
+            BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,0,ATTRIBUTE)               \
         >::param_type BOOST_PP_CAT(_,I)
 
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_N(                                      \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
+    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
         BOOST_FUSION_GPU_ENABLED                                \
         NAME(BOOST_PP_SEQ_FOR_EACH_I_R(                                         \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I,                          \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 ATTRIBUTES_SEQ))                                                \
           : BOOST_PP_SEQ_FOR_EACH_I_R(                                          \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_STRUCT_CTOR_FILLER_I,                       \
-                ATTRIBUTE_TUPLE_SIZE,                                           \
+                ATTRIBUTE_TUPEL_SIZE,                                           \
                 ATTRIBUTES_SEQ)                                                 \
         {}
 
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR(                                        \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
+    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
     BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),                \
         BOOST_FUSION_DEFINE_STRUCT_CTOR_N,                                      \
         BOOST_FUSION_DEFINE_STRUCT_CTOR_1)(                                     \
-            NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
+            NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR(                                    \
-    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)            \
+    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)            \
                                                                                 \
     BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),                \
         BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N,                                  \
         BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1)(                                 \
-            TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
+            TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_NONEMPTY_STRUCT_IMPL(                               \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                                 \
+    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
         BOOST_FUSION_DEFINE_STRUCT_IMPL_IMPL(                                   \
-            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPLE_SIZE)      \
+            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPEL_SIZE)      \
                                                                                 \
         BOOST_FUSION_DEFINE_STRUCT_CTOR(                                        \
-            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPLE_SIZE)
+            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_EMPTY_STRUCT_IMPL(                                  \
-    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
+    NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
+                                                                                \
+        template<typename Seq>                                                  \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
+        NAME(Seq const&)                                                        \
+        {}                                                                      \
+                                                                                \
+        template<typename Seq>                                                  \
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                          \
+        self_type&                                                              \
+        operator=(Seq const& seq)                                               \
+        {                                                                       \
+            return *this;                                                       \
+        }
 
 #define BOOST_FUSION_DEFINE_STRUCT_IMPL(                                        \
-    NAMESPACE_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                  \
+    NAMESPACE_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                  \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_BEGIN(NAMESPACE_SEQ)         \
                                                                                 \
@@ -422,32 +311,35 @@
         BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),            \
             BOOST_FUSION_DEFINE_NONEMPTY_STRUCT_IMPL,                           \
             BOOST_FUSION_DEFINE_EMPTY_STRUCT_IMPL)(                             \
-                NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)                     \
+                NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                     \
     };                                                                          \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_END(NAMESPACE_SEQ)
 
 #define BOOST_FUSION_DEFINE_NONEMPTY_TPL_STRUCT_IMPL(                           \
-    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)            \
+    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)            \
                                                                                 \
         BOOST_FUSION_DEFINE_STRUCT_IMPL_IMPL(                                   \
-            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPLE_SIZE)      \
+            NAME, BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ), ATTRIBUTE_TUPEL_SIZE)      \
                                                                                 \
         BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR(                                    \
             TEMPLATE_PARAMS_SEQ,                                                \
             NAME,                                                               \
             BOOST_PP_SEQ_TAIL(ATTRIBUTES_SEQ),                                  \
-            ATTRIBUTE_TUPLE_SIZE)
+            ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_EMPTY_TPL_STRUCT_IMPL(                              \
-    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)
+    TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)            \
+                                                                                \
+        BOOST_FUSION_DEFINE_EMPTY_STRUCT_IMPL(                                  \
+            NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)
 
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_IMPL(                                    \
     TEMPLATE_PARAMS_SEQ,                                                        \
     NAMESPACE_SEQ,                                                              \
     NAME,                                                                       \
     ATTRIBUTES_SEQ,                                                             \
-    ATTRIBUTE_TUPLE_SIZE)                                                       \
+    ATTRIBUTE_TUPEL_SIZE)                                                       \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_BEGIN(NAMESPACE_SEQ)         \
                                                                                 \
@@ -462,7 +354,7 @@
         BOOST_PP_IF(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),            \
             BOOST_FUSION_DEFINE_NONEMPTY_TPL_STRUCT_IMPL,                       \
             BOOST_FUSION_DEFINE_EMPTY_TPL_STRUCT_IMPL)(                         \
-                TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPLE_SIZE)\
+                TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)\
     };                                                                          \
                                                                                 \
     BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_END(NAMESPACE_SEQ)

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

@@ -22,7 +22,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/preprocessor/comma_if.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
+#include <boost/preprocessor/facilities/is_empty.hpp>
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
 #include <boost/preprocessor/seq/size.hpp>
@@ -62,6 +62,7 @@
               ~,                                                                \
               ATTRIBUTES_SEQ)                                                   \
 
+#define BOOST_FUSION_IGNORE_1(ARG1)
 #define BOOST_FUSION_IGNORE_2(ARG1, ARG2)
 
 #define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ)                \
@@ -424,10 +425,17 @@
 #define BOOST_FUSION_DEFINE_STRUCT_INLINE_MEMBERS_IMPL_IMPL(                    \
     NAME, ATTRIBUTES_SEQ, ATTRIBUTES_SEQ_SIZE)                                  \
                                                                                 \
+    /* Note: second BOOST_PP_IF is necessary to avoid MSVC warning when */      \
+    /*       calling BOOST_FUSION_IGNORE_1 with no arguments.           */      \
     NAME()                                                                      \
-        BOOST_PP_IF(ATTRIBUTES_SEQ_SIZE,                                        \
+        BOOST_PP_IF(                                                            \
+            ATTRIBUTES_SEQ_SIZE,                                                \
             BOOST_FUSION_MAKE_DEFAULT_INIT_LIST,                                \
-            BOOST_PP_EMPTY)(ATTRIBUTES_SEQ)                                     \
+            BOOST_FUSION_IGNORE_1)                                              \
+                (BOOST_PP_IF(                                                   \
+                    ATTRIBUTES_SEQ_SIZE,                                        \
+                    ATTRIBUTES_SEQ,                                             \
+                    0))                                                         \
     {                                                                           \
     }                                                                           \
                                                                                 \

include/boost/fusion/adapted/struct/detail/preprocessor/is_seq.hpp

@@ -13,6 +13,8 @@
 #ifndef BOOST_FUSION_ADAPTED_STRUCT_DETAIL_PREPROCESSOR_IS_SEQ_HPP
 #define BOOST_FUSION_ADAPTED_STRUCT_DETAIL_PREPROCESSOR_IS_SEQ_HPP
 
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/punctuation/paren.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/config/config.hpp>

include/boost/fusion/algorithm/iteration/accumulate.hpp

@@ -1,6 +1,5 @@
 /*=============================================================================
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -11,6 +10,8 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/algorithm/iteration/accumulate_fwd.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
+#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace boost { namespace fusion
 {
@@ -26,7 +27,11 @@ namespace boost { namespace fusion
 
     template <typename Sequence, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::accumulate<Sequence, State const, F>::type
+    inline typename
+        lazy_enable_if<
+            traits::is_sequence<Sequence>
+          , result_of::accumulate<Sequence, State const, F>
+        >::type
     accumulate(Sequence& seq, State const& state, F f)
     {
         return fusion::fold(seq, state, f);
@@ -34,7 +39,11 @@ namespace boost { namespace fusion
 
     template <typename Sequence, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::accumulate<Sequence const, State const, F>::type
+    inline typename
+        lazy_enable_if<
+            traits::is_sequence<Sequence>
+          , result_of::accumulate<Sequence const, State const, F>
+        >::type
     accumulate(Sequence const& seq, State const& state, F f)
     {
         return fusion::fold(seq, state, f);

include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp

@@ -1,6 +1,5 @@
 /*=============================================================================
     Copyright (c) 2011 Eric Niebler
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -9,6 +8,8 @@
 #define BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace boost { namespace fusion
 {
@@ -20,12 +21,20 @@ namespace boost { namespace fusion
 
     template <typename Sequence, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::accumulate<Sequence, State const, F>::type
+    inline typename
+        lazy_enable_if<
+            traits::is_sequence<Sequence>
+          , result_of::accumulate<Sequence, State const, F>
+        >::type
     accumulate(Sequence& seq, State const& state, F f);
 
     template <typename Sequence, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::accumulate<Sequence const, State const, F>::type
+    inline typename
+        lazy_enable_if<
+            traits::is_sequence<Sequence>
+          , result_of::accumulate<Sequence const, State const, F>
+        >::type
     accumulate(Sequence const& seq, State const& state, F f);
 }}
 

include/boost/fusion/algorithm/iteration/detail/fold.hpp

@@ -2,15 +2,12 @@
     Copyright (c) 2001-2011 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
     Copyright (c) 2009-2010 Christopher Schmidt
-    Copyright (c) 2015 Kohei Takahashi
 
     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/preprocessor/cat.hpp>
 
-#define FUSION_HASH #
-
 #ifdef BOOST_FUSION_REVERSE_FOLD
 #   ifdef BOOST_FUSION_ITER_FOLD
 #       define BOOST_FUSION_FOLD_NAME reverse_iter_fold
@@ -44,193 +41,378 @@
 #   define BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(IT) fusion::deref(IT)
 #endif
 
-#if (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, < 1500)
-FUSION_HASH     define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-FUSION_HASH else
-FUSION_HASH     define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-FUSION_HASH endif
-#else
-#   if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-#       define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-#   else
-#       define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-#   endif
-#endif
-
 namespace boost { namespace fusion
 {
     namespace detail
     {
-        template<int SeqSize, typename It, typename State, typename F, typename = void
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, < 1500)
-#endif
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1500) || \
-    (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-          // Dirty hack: those compilers cannot choose exactly one partial specialization.
-          , bool = SeqSize == 0
-#endif
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH endif
-#endif
-        >
-        struct BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)
+        template<typename State, typename It, typename F>
+        struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)
+          : fusion::detail::result_of_with_decltype<
+                F(
+                typename add_reference<typename add_const<State>::type>::type,
+                BOOST_FUSION_FOLD_IMPL_INVOKE_IT_META_TRANSFORM(It))
+            >
         {};
 
-        template<typename It, typename State, typename F>
-        struct BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<0,It,State,F
-          , typename boost::enable_if_has_type<BOOST_FUSION_FOLD_IMPL_ENABLER(State)>::type
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, < 1500)
-#endif
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1500) || \
-    (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-          , true
-#endif
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH endif
-#endif
-          >
+        template<typename Result,int N>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)
         {
-            typedef typename State::type type;
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_3(State3 const& state3,It3 const& it3,F& f)
+            {
+                return BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<
+                    Result
+                  , N-4
+                >::call(
+                    f(state3,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it3)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it3),
+                    f);
+            }
+
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it2)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it2),
+                    f);
+            }
+
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1),
+                    f);
+            }
+
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
+            }
         };
 
-        template<int SeqSize, typename It, typename State, typename F>
-        struct BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<SeqSize,It,State,F
-          , typename boost::enable_if_has_type<
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, >= 1500)
-#endif
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1500) || \
-    (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-                // Following SFINAE enables to avoid MSVC 9's partial specialization
-                // ambiguous bug but MSVC 8 don't compile, and moreover MSVC 8 style
-                // workaround won't work with MSVC 9.
-                typename boost::disable_if_c<SeqSize == 0, State>::type::type
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-#endif
-#else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-#endif
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH endif
-#endif
-            >::type
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH if BOOST_WORKAROUND BOOST_PREVENT_MACRO_SUBSTITUTION (BOOST_MSVC, < 1500)
-#endif
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1500) || \
-    (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-          , false
-#endif
-#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
-FUSION_HASH endif
-#endif
-          >
-          : BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<
-                SeqSize-1
-              , typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        BOOST_FUSION_FOLD_IMPL_INVOKE_IT_META_TRANSFORM(It const)
-                    )
-                >
-              , F
-            >
-        {};
+        template<typename Result>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it2));
+            }
 
-        template<typename It, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<
-            0
-          , It
-          , State
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it1),
+                    f);
+            }
+
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
+            }
+        };
+
+        template<typename Result>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,2>
+        {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it1));
+            }
+
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0)),
+                    fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it0),
+                    f);
+            }
+        };
+
+        template<typename Result>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,1>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return f(state,
+                    BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it0));
+            }
+        };
+
+        template<typename Result>
+        struct BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<Result,0>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const&, F)
+            {
+                return static_cast<Result>(state);
+            }
+        };
+
+        template<typename StateRef, typename It0, typename F, int N>
+        struct BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)
+        {
+            typedef typename
+                BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    rest1
+                  , it1
+                  , F
+                >::type
+            rest2;
+            typedef typename
+                result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<it1>::type
+            it2;
+            typedef typename
+                BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    rest2
+                  , it2
+                  , F
+                >::type
+            rest3;
+            typedef typename
+                result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<it2>::type
+            it3;
+
+            typedef typename
+                BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+                    typename BOOST_PP_CAT(
+                        BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                        rest3
+                      , it3
+                      , F
+                    >::type
+                  , typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                        it3
+                    >::type
+                  , F
+                  , N-4
+                >::type
+            type;
+        };
+
+        template<typename StateRef, typename It0, typename F>
+        struct BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+            StateRef
+          , It0
           , F
-        >::type
-        BOOST_PP_CAT(it_,BOOST_FUSION_FOLD_NAME)(mpl::int_<0>, It const&, typename State::type state, F&)
+          , 3
+        >
         {
-            return state;
-        }
+            typedef typename
+                BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                    It0 const
+                >::type
+            it1;
 
-        template<typename It, typename State, typename F, int SeqSize>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename lazy_enable_if_c<
-            SeqSize != 0
-          , BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<
-                SeqSize
-              , It
-              , State
+            typedef typename
+                BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    typename BOOST_PP_CAT(
+                        BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                        rest1
+                      , it1
+                      , F
+                    >::type
+                  , typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                        it1 const
+                    >::type const
+                  , F
+                >::type
+            type;
+        };
+
+        template<typename StateRef, typename It0, typename F>
+        struct BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+            StateRef
+          , It0
+          , F
+          , 2
+        >
+          : BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                typename BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+              , typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                    It0 const
+                >::type const
               , F
             >
-        >::type
-        BOOST_PP_CAT(it_,BOOST_FUSION_FOLD_NAME)(mpl::int_<SeqSize>, It const& it, typename State::type state, F& f)
+        {};
+
+        template<typename StateRef, typename It0, typename F>
+        struct BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+            StateRef
+          , It0
+          , F
+          , 1
+        >
+          : BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME, _lvalue_state)<
+                StateRef
+              , It0 const
+              , F
+            >
+        {};
+
+        template<typename StateRef, typename It0, typename F>
+        struct BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+            StateRef
+          , It0
+          , F
+          , 0
+        >
         {
-            return BOOST_PP_CAT(it_,BOOST_FUSION_FOLD_NAME)<
-                typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        BOOST_FUSION_FOLD_IMPL_INVOKE_IT_META_TRANSFORM(It const)
+            typedef StateRef type;
+        };
+
+        template<typename StateRef, typename It0, typename F, int SeqSize>
+        struct BOOST_PP_CAT(result_of_first_unrolled,BOOST_FUSION_FOLD_NAME)
+        {
+            typedef typename
+                BOOST_PP_CAT(result_of_unrolled_,BOOST_FUSION_FOLD_NAME)<
+                    typename fusion::detail::result_of_with_decltype<
+                        F(
+                            StateRef,
+                            BOOST_FUSION_FOLD_IMPL_INVOKE_IT_META_TRANSFORM(
+                                It0 const)
+                        )
+                    >::type
+                  , typename result_of::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION<
+                        It0 const
+                    >::type
+                  , F
+                  , SeqSize-1
+                >::type
+            type;
+        };
+
+        template<int SeqSize, typename StateRef, typename Seq, typename F>
+        struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)
+        {
+            typedef typename
+                BOOST_PP_CAT(
+                    result_of_first_unrolled,BOOST_FUSION_FOLD_NAME)<
+                    StateRef
+                  , BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM(
+                        typename result_of::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION<Seq>::type
                     )
-                >
-              , F
-            >(
-                mpl::int_<SeqSize-1>()
-              , fusion::BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION(it)
-              , f(state, BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM(it))
-              , f
-            );
-        }
+                  , F
+                  , SeqSize
+                >::type
+            type;
 
-        template<typename Seq, typename State, typename F
-          , bool = traits::is_sequence<Seq>::value
-          , bool = traits::is_segmented<Seq>::value>
-        struct BOOST_PP_CAT(result_of_,BOOST_FUSION_FOLD_NAME)
-        {};
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static type
+            call(StateRef state, Seq& seq, F f)
+            {
+                typedef
+                    BOOST_PP_CAT(unrolled_,BOOST_FUSION_FOLD_NAME)<
+                        type
+                      , SeqSize
+                    >
+                unrolled_impl;
 
-        template<typename Seq, typename State, typename F>
-        struct BOOST_PP_CAT(result_of_,BOOST_FUSION_FOLD_NAME)<Seq, State, F, true, false>
-          : BOOST_PP_CAT(result_of_it_,BOOST_FUSION_FOLD_NAME)<
+                return unrolled_impl::call(
+                    state,
+                    BOOST_FUSION_FOLD_IMPL_FIRST_IT_TRANSFORM(
+                        fusion::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION(seq)),
+                    f);
+            }
+        };
+
+        template<typename StateRef, typename Seq, typename F>
+        struct BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<0,StateRef,Seq,F>
+        {
+            typedef StateRef type;
+
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static StateRef
+            call(StateRef state, Seq&, F)
+            {
+                return static_cast<StateRef>(state);
+            }
+        };
+
+        template<typename Seq, typename State, typename F, bool IsSegmented>
+        struct BOOST_PP_CAT(result_of_, BOOST_FUSION_FOLD_NAME)
+          : BOOST_PP_CAT(BOOST_FUSION_FOLD_NAME,_impl)<
                 result_of::size<Seq>::value
-              , BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM(
-                    typename result_of::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION<Seq>::type
-                )
-              , add_reference<State>
+              , typename add_reference<
+                    typename add_const<State>::type
+                >::type
+              , Seq
               , F
             >
         {};
-
-        template<typename Seq, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename BOOST_PP_CAT(result_of_,BOOST_FUSION_FOLD_NAME)<Seq, State, F>::type
-        BOOST_FUSION_FOLD_NAME(Seq& seq, State& state, F& f)
-        {
-            return BOOST_PP_CAT(it_,BOOST_FUSION_FOLD_NAME)<
-                BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM(
-                    typename result_of::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION<Seq>::type
-                )
-              , add_reference<State>
-              , F
-            >(
-                typename result_of::size<Seq>::type()
-              , BOOST_FUSION_FOLD_IMPL_FIRST_IT_TRANSFORM(
-                    fusion::BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION(seq)
-                )
-              , state
-              , f
-            );
-        }
     }
 
     namespace result_of
     {
         template<typename Seq, typename State, typename F>
         struct BOOST_FUSION_FOLD_NAME
-          : detail::BOOST_PP_CAT(result_of_,BOOST_FUSION_FOLD_NAME)<Seq, State, F>
+          : detail::BOOST_PP_CAT(result_of_, BOOST_FUSION_FOLD_NAME)<
+                Seq
+              , State
+              , F
+              , traits::is_segmented<Seq>::type::value
+            >
         {};
     }
 
@@ -243,7 +425,10 @@ FUSION_HASH endif
     >::type
     BOOST_FUSION_FOLD_NAME(Seq& seq, State const& state, F f)
     {
-        return detail::BOOST_FUSION_FOLD_NAME<Seq, State const, F>(seq, state, f);
+        return result_of::BOOST_FUSION_FOLD_NAME<Seq,State const,F>::call(
+            state,
+            seq,
+            f);
     }
 
     template<typename Seq, typename State, typename F>
@@ -255,40 +440,47 @@ FUSION_HASH endif
     >::type
     BOOST_FUSION_FOLD_NAME(Seq const& seq, State const& state, F f)
     {
-        return detail::BOOST_FUSION_FOLD_NAME<Seq const, State const, F>(seq, state, f);
+        return result_of::BOOST_FUSION_FOLD_NAME<Seq const,State const,F>::call(
+            state,
+            seq,
+            f);
     }
 
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::BOOST_FUSION_FOLD_NAME<
         Seq
-      , State
+      , State const
       , F
     >::type
     BOOST_FUSION_FOLD_NAME(Seq& seq, State& state, F f)
     {
-        return detail::BOOST_FUSION_FOLD_NAME<Seq, State, F>(seq, state, f);
+        return result_of::BOOST_FUSION_FOLD_NAME<Seq,State,F>::call(
+            state,
+            seq,
+            f);
     }
 
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::BOOST_FUSION_FOLD_NAME<
         Seq const
-      , State
+      , State const
       , F
     >::type
     BOOST_FUSION_FOLD_NAME(Seq const& seq, State& state, F f)
     {
-        return detail::BOOST_FUSION_FOLD_NAME<Seq const, State, F>(seq, state, f);
+        return result_of::BOOST_FUSION_FOLD_NAME<Seq const,State,F>::call(
+            state,
+            seq,
+            f);
     }
 }}
 
 #undef BOOST_FUSION_FOLD_NAME
-#undef BOOST_FUSION_FOLD_IMPL_ENABLER
 #undef BOOST_FUSION_FOLD_IMPL_FIRST_IT_FUNCTION
 #undef BOOST_FUSION_FOLD_IMPL_NEXT_IT_FUNCTION
 #undef BOOST_FUSION_FOLD_IMPL_FIRST_IT_META_TRANSFORM
 #undef BOOST_FUSION_FOLD_IMPL_FIRST_IT_TRANSFORM
 #undef BOOST_FUSION_FOLD_IMPL_INVOKE_IT_META_TRANSFORM
 #undef BOOST_FUSION_FOLD_IMPL_INVOKE_IT_TRANSFORM
-#undef FUSION_HASH

include/boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp

@@ -8,138 +8,345 @@
 
     This is an auto-generated file. Do not edit!
 ==============================================================================*/
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-# else
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-# endif
 namespace boost { namespace fusion
 {
     namespace detail
     {
-        template<int SeqSize, typename It, typename State, typename F, typename = void
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          
-          , bool = SeqSize == 0
-# endif
-        >
-        struct result_of_it_fold
+        template<typename State, typename It, typename F>
+        struct fold_lvalue_state
+          : fusion::detail::result_of_with_decltype<
+                F(
+                typename add_reference<typename add_const<State>::type>::type,
+                typename fusion::result_of::deref<It>::type)
+            >
         {};
-        template<typename It, typename State, typename F>
-        struct result_of_it_fold<0,It,State,F
-          , typename boost::enable_if_has_type<BOOST_FUSION_FOLD_IMPL_ENABLER(State)>::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , true
-# endif
-          >
+        template<typename Result,int N>
+        struct unrolled_fold
         {
-            typedef typename State::type type;
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_3(State3 const& state3,It3 const& it3,F& f)
+            {
+                return unrolled_fold<
+                    Result
+                  , N-4
+                >::call(
+                    f(state3,fusion::deref(it3)),
+                    fusion::next(it3),
+                    f);
+            }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,fusion::deref(it2)),
+                    fusion::next(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
+            }
         };
-        template<int SeqSize, typename It, typename State, typename F>
-        struct result_of_it_fold<SeqSize,It,State,F
-          , typename boost::enable_if_has_type<
-# if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)
-                
-                
-                
-                typename boost::disable_if_c<SeqSize == 0, State>::type::type
-# else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-# endif
-            >::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , false
-# endif
-          >
-          : result_of_it_fold<
-                SeqSize-1
-              , typename result_of::next<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        typename fusion::result_of::deref<It const>::type
-                    )
-                >
-              , F
-            >
-        {};
-        template<typename It, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_it_fold<
-            0
-          , It
-          , State
+        template<typename Result>
+        struct unrolled_fold<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,fusion::deref(it2));
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_fold<Result,2>
+        {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,fusion::deref(it1));
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::next(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_fold<Result,1>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return f(state,
+                    fusion::deref(it0));
+            }
+        };
+        template<typename Result>
+        struct unrolled_fold<Result,0>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const&, F)
+            {
+                return static_cast<Result>(state);
+            }
+        };
+        template<typename StateRef, typename It0, typename F, int N>
+        struct result_of_unrolled_fold
+        {
+            typedef typename
+                fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::next<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                fold_lvalue_state<
+                    rest1
+                  , it1
+                  , F
+                >::type
+            rest2;
+            typedef typename
+                result_of::next<it1>::type
+            it2;
+            typedef typename
+                fold_lvalue_state<
+                    rest2
+                  , it2
+                  , F
+                >::type
+            rest3;
+            typedef typename
+                result_of::next<it2>::type
+            it3;
+            typedef typename
+                result_of_unrolled_fold<
+                    typename fold_lvalue_state<
+                        rest3
+                      , it3
+                      , F
+                    >::type
+                  , typename result_of::next<
+                        it3
+                    >::type
+                  , F
+                  , N-4
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_fold<
+            StateRef
+          , It0
           , F
-        >::type
-        it_fold(mpl::int_<0>, It const&, typename State::type state, F&)
+          , 3
+        >
         {
-            return state;
-        }
-        template<typename It, typename State, typename F, int SeqSize>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename lazy_enable_if_c<
-            SeqSize != 0
-          , result_of_it_fold<
-                SeqSize
-              , It
-              , State
+            typedef typename
+                fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::next<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                fold_lvalue_state<
+                    typename fold_lvalue_state<
+                        rest1
+                      , it1
+                      , F
+                    >::type
+                  , typename result_of::next<
+                        it1 const
+                    >::type const
+                  , F
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_fold<
+            StateRef
+          , It0
+          , F
+          , 2
+        >
+          : fold_lvalue_state<
+                typename fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+              , typename result_of::next<
+                    It0 const
+                >::type const
               , F
             >
-        >::type
-        it_fold(mpl::int_<SeqSize>, It const& it, typename State::type state, F& f)
-        {
-            return it_fold<
-                typename result_of::next<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        typename fusion::result_of::deref<It const>::type
-                    )
-                >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_fold<
+            StateRef
+          , It0
+          , F
+          , 1
+        >
+          : fold_lvalue_state<
+                StateRef
+              , It0 const
               , F
-            >(
-                mpl::int_<SeqSize-1>()
-              , fusion::next(it)
-              , f(state, fusion::deref(it))
-              , f
-            );
-        }
-        template<typename Seq, typename State, typename F
-          , bool = traits::is_sequence<Seq>::value
-          , bool = traits::is_segmented<Seq>::value>
+            >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_fold<
+            StateRef
+          , It0
+          , F
+          , 0
+        >
+        {
+            typedef StateRef type;
+        };
+        template<typename StateRef, typename It0, typename F, int SeqSize>
+        struct result_of_first_unrolledfold
+        {
+            typedef typename
+                result_of_unrolled_fold<
+                    typename fusion::detail::result_of_with_decltype<
+                        F(
+                            StateRef,
+                            typename fusion::result_of::deref< It0 const>::type
+                        )
+                    >::type
+                  , typename result_of::next<
+                        It0 const
+                    >::type
+                  , F
+                  , SeqSize-1
+                >::type
+            type;
+        };
+        template<int SeqSize, typename StateRef, typename Seq, typename F>
+        struct fold_impl
+        {
+            typedef typename
+                result_of_first_unrolledfold<
+                    StateRef
+                  , typename result_of::begin<Seq>::type
+                  , F
+                  , SeqSize
+                >::type
+            type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static type
+            call(StateRef state, Seq& seq, F f)
+            {
+                typedef
+                    unrolled_fold<
+                        type
+                      , SeqSize
+                    >
+                unrolled_impl;
+                return unrolled_impl::call(
+                    state,
+                    fusion::begin(seq),
+                    f);
+            }
+        };
+        template<typename StateRef, typename Seq, typename F>
+        struct fold_impl<0,StateRef,Seq,F>
+        {
+            typedef StateRef type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static StateRef
+            call(StateRef state, Seq&, F)
+            {
+                return static_cast<StateRef>(state);
+            }
+        };
+        template<typename Seq, typename State, typename F, bool IsSegmented>
         struct result_of_fold
-        {};
-        template<typename Seq, typename State, typename F>
-        struct result_of_fold<Seq, State, F, true, false>
-          : result_of_it_fold<
+          : fold_impl<
                 result_of::size<Seq>::value
-              , typename result_of::begin<Seq>::type
-              , add_reference<State>
+              , typename add_reference<
+                    typename add_const<State>::type
+                >::type
+              , Seq
               , F
             >
         {};
-        template<typename Seq, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_fold<Seq, State, F>::type
-        fold(Seq& seq, State& state, F& f)
-        {
-            return it_fold<
-                typename result_of::begin<Seq>::type
-              , add_reference<State>
-              , F
-            >(
-                typename result_of::size<Seq>::type()
-              , fusion::begin(seq)
-              , state
-              , f
-            );
-        }
     }
     namespace result_of
     {
         template<typename Seq, typename State, typename F>
         struct fold
-          : detail::result_of_fold<Seq, State, F>
+          : detail::result_of_fold<
+                Seq
+              , State
+              , F
+              , traits::is_segmented<Seq>::type::value
+            >
         {};
     }
     template<typename Seq, typename State, typename F>
@@ -151,7 +358,10 @@ namespace boost { namespace fusion
     >::type
     fold(Seq& seq, State const& state, F f)
     {
-        return detail::fold<Seq, State const, F>(seq, state, f);
+        return result_of::fold<Seq,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
@@ -162,28 +372,37 @@ namespace boost { namespace fusion
     >::type
     fold(Seq const& seq, State const& state, F f)
     {
-        return detail::fold<Seq const, State const, F>(seq, state, f);
+        return result_of::fold<Seq const,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     fold(Seq& seq, State& state, F f)
     {
-        return detail::fold<Seq, State, F>(seq, state, f);
+        return result_of::fold<Seq,State,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     fold(Seq const& seq, State& state, F f)
     {
-        return detail::fold<Seq const, State, F>(seq, state, f);
+        return result_of::fold<Seq const,State,F>::call(
+            state,
+            seq,
+            f);
     }
 }}

include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp

@@ -7,138 +7,345 @@
 
     This is an auto-generated file. Do not edit!
 ==============================================================================*/
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-# else
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-# endif
 namespace boost { namespace fusion
 {
     namespace detail
     {
-        template<int SeqSize, typename It, typename State, typename F, typename = void
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          
-          , bool = SeqSize == 0
-# endif
-        >
-        struct result_of_it_iter_fold
+        template<typename State, typename It, typename F>
+        struct iter_fold_lvalue_state
+          : fusion::detail::result_of_with_decltype<
+                F(
+                typename add_reference<typename add_const<State>::type>::type,
+                It&)
+            >
         {};
-        template<typename It, typename State, typename F>
-        struct result_of_it_iter_fold<0,It,State,F
-          , typename boost::enable_if_has_type<BOOST_FUSION_FOLD_IMPL_ENABLER(State)>::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , true
-# endif
-          >
+        template<typename Result,int N>
+        struct unrolled_iter_fold
         {
-            typedef typename State::type type;
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_3(State3 const& state3,It3 const& it3,F& f)
+            {
+                return unrolled_iter_fold<
+                    Result
+                  , N-4
+                >::call(
+                    f(state3,it3),
+                    fusion::next(it3),
+                    f);
+            }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,it2),
+                    fusion::next(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
+            }
         };
-        template<int SeqSize, typename It, typename State, typename F>
-        struct result_of_it_iter_fold<SeqSize,It,State,F
-          , typename boost::enable_if_has_type<
-# if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)
-                
-                
-                
-                typename boost::disable_if_c<SeqSize == 0, State>::type::type
-# else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-# endif
-            >::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , false
-# endif
-          >
-          : result_of_it_iter_fold<
-                SeqSize-1
-              , typename result_of::next<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        It const&
-                    )
-                >
-              , F
-            >
-        {};
-        template<typename It, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_it_iter_fold<
-            0
-          , It
-          , State
+        template<typename Result>
+        struct unrolled_iter_fold<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,it2);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::next(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_iter_fold<Result,2>
+        {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,it1);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::next(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_iter_fold<Result,1>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return f(state,
+                    it0);
+            }
+        };
+        template<typename Result>
+        struct unrolled_iter_fold<Result,0>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const&, F)
+            {
+                return static_cast<Result>(state);
+            }
+        };
+        template<typename StateRef, typename It0, typename F, int N>
+        struct result_of_unrolled_iter_fold
+        {
+            typedef typename
+                iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::next<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                iter_fold_lvalue_state<
+                    rest1
+                  , it1
+                  , F
+                >::type
+            rest2;
+            typedef typename
+                result_of::next<it1>::type
+            it2;
+            typedef typename
+                iter_fold_lvalue_state<
+                    rest2
+                  , it2
+                  , F
+                >::type
+            rest3;
+            typedef typename
+                result_of::next<it2>::type
+            it3;
+            typedef typename
+                result_of_unrolled_iter_fold<
+                    typename iter_fold_lvalue_state<
+                        rest3
+                      , it3
+                      , F
+                    >::type
+                  , typename result_of::next<
+                        it3
+                    >::type
+                  , F
+                  , N-4
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_iter_fold<
+            StateRef
+          , It0
           , F
-        >::type
-        it_iter_fold(mpl::int_<0>, It const&, typename State::type state, F&)
+          , 3
+        >
         {
-            return state;
-        }
-        template<typename It, typename State, typename F, int SeqSize>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename lazy_enable_if_c<
-            SeqSize != 0
-          , result_of_it_iter_fold<
-                SeqSize
-              , It
-              , State
+            typedef typename
+                iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::next<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                iter_fold_lvalue_state<
+                    typename iter_fold_lvalue_state<
+                        rest1
+                      , it1
+                      , F
+                    >::type
+                  , typename result_of::next<
+                        it1 const
+                    >::type const
+                  , F
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 2
+        >
+          : iter_fold_lvalue_state<
+                typename iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+              , typename result_of::next<
+                    It0 const
+                >::type const
               , F
             >
-        >::type
-        it_iter_fold(mpl::int_<SeqSize>, It const& it, typename State::type state, F& f)
-        {
-            return it_iter_fold<
-                typename result_of::next<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        It const&
-                    )
-                >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 1
+        >
+          : iter_fold_lvalue_state<
+                StateRef
+              , It0 const
               , F
-            >(
-                mpl::int_<SeqSize-1>()
-              , fusion::next(it)
-              , f(state, it)
-              , f
-            );
-        }
-        template<typename Seq, typename State, typename F
-          , bool = traits::is_sequence<Seq>::value
-          , bool = traits::is_segmented<Seq>::value>
+            >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 0
+        >
+        {
+            typedef StateRef type;
+        };
+        template<typename StateRef, typename It0, typename F, int SeqSize>
+        struct result_of_first_unrollediter_fold
+        {
+            typedef typename
+                result_of_unrolled_iter_fold<
+                    typename fusion::detail::result_of_with_decltype<
+                        F(
+                            StateRef,
+                            It0 const&
+                        )
+                    >::type
+                  , typename result_of::next<
+                        It0 const
+                    >::type
+                  , F
+                  , SeqSize-1
+                >::type
+            type;
+        };
+        template<int SeqSize, typename StateRef, typename Seq, typename F>
+        struct iter_fold_impl
+        {
+            typedef typename
+                result_of_first_unrollediter_fold<
+                    StateRef
+                  , typename result_of::begin<Seq>::type
+                  , F
+                  , SeqSize
+                >::type
+            type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static type
+            call(StateRef state, Seq& seq, F f)
+            {
+                typedef
+                    unrolled_iter_fold<
+                        type
+                      , SeqSize
+                    >
+                unrolled_impl;
+                return unrolled_impl::call(
+                    state,
+                    fusion::begin(seq),
+                    f);
+            }
+        };
+        template<typename StateRef, typename Seq, typename F>
+        struct iter_fold_impl<0,StateRef,Seq,F>
+        {
+            typedef StateRef type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static StateRef
+            call(StateRef state, Seq&, F)
+            {
+                return static_cast<StateRef>(state);
+            }
+        };
+        template<typename Seq, typename State, typename F, bool IsSegmented>
         struct result_of_iter_fold
-        {};
-        template<typename Seq, typename State, typename F>
-        struct result_of_iter_fold<Seq, State, F, true, false>
-          : result_of_it_iter_fold<
+          : iter_fold_impl<
                 result_of::size<Seq>::value
-              , typename result_of::begin<Seq>::type
-              , add_reference<State>
+              , typename add_reference<
+                    typename add_const<State>::type
+                >::type
+              , Seq
               , F
             >
         {};
-        template<typename Seq, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_iter_fold<Seq, State, F>::type
-        iter_fold(Seq& seq, State& state, F& f)
-        {
-            return it_iter_fold<
-                typename result_of::begin<Seq>::type
-              , add_reference<State>
-              , F
-            >(
-                typename result_of::size<Seq>::type()
-              , fusion::begin(seq)
-              , state
-              , f
-            );
-        }
     }
     namespace result_of
     {
         template<typename Seq, typename State, typename F>
         struct iter_fold
-          : detail::result_of_iter_fold<Seq, State, F>
+          : detail::result_of_iter_fold<
+                Seq
+              , State
+              , F
+              , traits::is_segmented<Seq>::type::value
+            >
         {};
     }
     template<typename Seq, typename State, typename F>
@@ -150,7 +357,10 @@ namespace boost { namespace fusion
     >::type
     iter_fold(Seq& seq, State const& state, F f)
     {
-        return detail::iter_fold<Seq, State const, F>(seq, state, f);
+        return result_of::iter_fold<Seq,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
@@ -161,28 +371,37 @@ namespace boost { namespace fusion
     >::type
     iter_fold(Seq const& seq, State const& state, F f)
     {
-        return detail::iter_fold<Seq const, State const, F>(seq, state, f);
+        return result_of::iter_fold<Seq const,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     iter_fold(Seq& seq, State& state, F f)
     {
-        return detail::iter_fold<Seq, State, F>(seq, state, f);
+        return result_of::iter_fold<Seq,State,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     iter_fold(Seq const& seq, State& state, F f)
     {
-        return detail::iter_fold<Seq const, State, F>(seq, state, f);
+        return result_of::iter_fold<Seq const,State,F>::call(
+            state,
+            seq,
+            f);
     }
 }}

include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp

@@ -7,138 +7,345 @@
 
     This is an auto-generated file. Do not edit!
 ==============================================================================*/
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-# else
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-# endif
 namespace boost { namespace fusion
 {
     namespace detail
     {
-        template<int SeqSize, typename It, typename State, typename F, typename = void
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          
-          , bool = SeqSize == 0
-# endif
-        >
-        struct result_of_it_reverse_fold
+        template<typename State, typename It, typename F>
+        struct reverse_fold_lvalue_state
+          : fusion::detail::result_of_with_decltype<
+                F(
+                typename add_reference<typename add_const<State>::type>::type,
+                typename fusion::result_of::deref<It>::type)
+            >
         {};
-        template<typename It, typename State, typename F>
-        struct result_of_it_reverse_fold<0,It,State,F
-          , typename boost::enable_if_has_type<BOOST_FUSION_FOLD_IMPL_ENABLER(State)>::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , true
-# endif
-          >
+        template<typename Result,int N>
+        struct unrolled_reverse_fold
         {
-            typedef typename State::type type;
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_3(State3 const& state3,It3 const& it3,F& f)
+            {
+                return unrolled_reverse_fold<
+                    Result
+                  , N-4
+                >::call(
+                    f(state3,fusion::deref(it3)),
+                    fusion::prior(it3),
+                    f);
+            }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,fusion::deref(it2)),
+                    fusion::prior(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
+            }
         };
-        template<int SeqSize, typename It, typename State, typename F>
-        struct result_of_it_reverse_fold<SeqSize,It,State,F
-          , typename boost::enable_if_has_type<
-# if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)
-                
-                
-                
-                typename boost::disable_if_c<SeqSize == 0, State>::type::type
-# else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-# endif
-            >::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , false
-# endif
-          >
-          : result_of_it_reverse_fold<
-                SeqSize-1
-              , typename result_of::prior<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        typename fusion::result_of::deref<It const>::type
-                    )
-                >
-              , F
-            >
-        {};
-        template<typename It, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_it_reverse_fold<
-            0
-          , It
-          , State
+        template<typename Result>
+        struct unrolled_reverse_fold<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,fusion::deref(it2));
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,fusion::deref(it1)),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_fold<Result,2>
+        {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,fusion::deref(it1));
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,fusion::deref(it0)),
+                    fusion::prior(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_fold<Result,1>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return f(state,
+                    fusion::deref(it0));
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_fold<Result,0>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const&, F)
+            {
+                return static_cast<Result>(state);
+            }
+        };
+        template<typename StateRef, typename It0, typename F, int N>
+        struct result_of_unrolled_reverse_fold
+        {
+            typedef typename
+                reverse_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::prior<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                reverse_fold_lvalue_state<
+                    rest1
+                  , it1
+                  , F
+                >::type
+            rest2;
+            typedef typename
+                result_of::prior<it1>::type
+            it2;
+            typedef typename
+                reverse_fold_lvalue_state<
+                    rest2
+                  , it2
+                  , F
+                >::type
+            rest3;
+            typedef typename
+                result_of::prior<it2>::type
+            it3;
+            typedef typename
+                result_of_unrolled_reverse_fold<
+                    typename reverse_fold_lvalue_state<
+                        rest3
+                      , it3
+                      , F
+                    >::type
+                  , typename result_of::prior<
+                        it3
+                    >::type
+                  , F
+                  , N-4
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_fold<
+            StateRef
+          , It0
           , F
-        >::type
-        it_reverse_fold(mpl::int_<0>, It const&, typename State::type state, F&)
+          , 3
+        >
         {
-            return state;
-        }
-        template<typename It, typename State, typename F, int SeqSize>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename lazy_enable_if_c<
-            SeqSize != 0
-          , result_of_it_reverse_fold<
-                SeqSize
-              , It
-              , State
+            typedef typename
+                reverse_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::prior<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                reverse_fold_lvalue_state<
+                    typename reverse_fold_lvalue_state<
+                        rest1
+                      , it1
+                      , F
+                    >::type
+                  , typename result_of::prior<
+                        it1 const
+                    >::type const
+                  , F
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_fold<
+            StateRef
+          , It0
+          , F
+          , 2
+        >
+          : reverse_fold_lvalue_state<
+                typename reverse_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+              , typename result_of::prior<
+                    It0 const
+                >::type const
               , F
             >
-        >::type
-        it_reverse_fold(mpl::int_<SeqSize>, It const& it, typename State::type state, F& f)
-        {
-            return it_reverse_fold<
-                typename result_of::prior<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        typename fusion::result_of::deref<It const>::type
-                    )
-                >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_fold<
+            StateRef
+          , It0
+          , F
+          , 1
+        >
+          : reverse_fold_lvalue_state<
+                StateRef
+              , It0 const
               , F
-            >(
-                mpl::int_<SeqSize-1>()
-              , fusion::prior(it)
-              , f(state, fusion::deref(it))
-              , f
-            );
-        }
-        template<typename Seq, typename State, typename F
-          , bool = traits::is_sequence<Seq>::value
-          , bool = traits::is_segmented<Seq>::value>
+            >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_fold<
+            StateRef
+          , It0
+          , F
+          , 0
+        >
+        {
+            typedef StateRef type;
+        };
+        template<typename StateRef, typename It0, typename F, int SeqSize>
+        struct result_of_first_unrolledreverse_fold
+        {
+            typedef typename
+                result_of_unrolled_reverse_fold<
+                    typename fusion::detail::result_of_with_decltype<
+                        F(
+                            StateRef,
+                            typename fusion::result_of::deref< It0 const>::type
+                        )
+                    >::type
+                  , typename result_of::prior<
+                        It0 const
+                    >::type
+                  , F
+                  , SeqSize-1
+                >::type
+            type;
+        };
+        template<int SeqSize, typename StateRef, typename Seq, typename F>
+        struct reverse_fold_impl
+        {
+            typedef typename
+                result_of_first_unrolledreverse_fold<
+                    StateRef
+                  , typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
+                  , F
+                  , SeqSize
+                >::type
+            type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static type
+            call(StateRef state, Seq& seq, F f)
+            {
+                typedef
+                    unrolled_reverse_fold<
+                        type
+                      , SeqSize
+                    >
+                unrolled_impl;
+                return unrolled_impl::call(
+                    state,
+                    fusion::prior( fusion::end(seq)),
+                    f);
+            }
+        };
+        template<typename StateRef, typename Seq, typename F>
+        struct reverse_fold_impl<0,StateRef,Seq,F>
+        {
+            typedef StateRef type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static StateRef
+            call(StateRef state, Seq&, F)
+            {
+                return static_cast<StateRef>(state);
+            }
+        };
+        template<typename Seq, typename State, typename F, bool IsSegmented>
         struct result_of_reverse_fold
-        {};
-        template<typename Seq, typename State, typename F>
-        struct result_of_reverse_fold<Seq, State, F, true, false>
-          : result_of_it_reverse_fold<
+          : reverse_fold_impl<
                 result_of::size<Seq>::value
-              , typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
-              , add_reference<State>
+              , typename add_reference<
+                    typename add_const<State>::type
+                >::type
+              , Seq
               , F
             >
         {};
-        template<typename Seq, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_reverse_fold<Seq, State, F>::type
-        reverse_fold(Seq& seq, State& state, F& f)
-        {
-            return it_reverse_fold<
-                typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
-              , add_reference<State>
-              , F
-            >(
-                typename result_of::size<Seq>::type()
-              , fusion::prior( fusion::end(seq) )
-              , state
-              , f
-            );
-        }
     }
     namespace result_of
     {
         template<typename Seq, typename State, typename F>
         struct reverse_fold
-          : detail::result_of_reverse_fold<Seq, State, F>
+          : detail::result_of_reverse_fold<
+                Seq
+              , State
+              , F
+              , traits::is_segmented<Seq>::type::value
+            >
         {};
     }
     template<typename Seq, typename State, typename F>
@@ -150,7 +357,10 @@ namespace boost { namespace fusion
     >::type
     reverse_fold(Seq& seq, State const& state, F f)
     {
-        return detail::reverse_fold<Seq, State const, F>(seq, state, f);
+        return result_of::reverse_fold<Seq,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
@@ -161,28 +371,37 @@ namespace boost { namespace fusion
     >::type
     reverse_fold(Seq const& seq, State const& state, F f)
     {
-        return detail::reverse_fold<Seq const, State const, F>(seq, state, f);
+        return result_of::reverse_fold<Seq const,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     reverse_fold(Seq& seq, State& state, F f)
     {
-        return detail::reverse_fold<Seq, State, F>(seq, state, f);
+        return result_of::reverse_fold<Seq,State,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     reverse_fold(Seq const& seq, State& state, F f)
     {
-        return detail::reverse_fold<Seq const, State, F>(seq, state, f);
+        return result_of::reverse_fold<Seq const,State,F>::call(
+            state,
+            seq,
+            f);
     }
 }}

include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp

@@ -7,138 +7,345 @@
 
     This is an auto-generated file. Do not edit!
 ==============================================================================*/
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) void
-# else
-# define BOOST_FUSION_FOLD_IMPL_ENABLER(T) typename T::type
-# endif
 namespace boost { namespace fusion
 {
     namespace detail
     {
-        template<int SeqSize, typename It, typename State, typename F, typename = void
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          
-          , bool = SeqSize == 0
-# endif
-        >
-        struct result_of_it_reverse_iter_fold
+        template<typename State, typename It, typename F>
+        struct reverse_iter_fold_lvalue_state
+          : fusion::detail::result_of_with_decltype<
+                F(
+                typename add_reference<typename add_const<State>::type>::type,
+                It&)
+            >
         {};
-        template<typename It, typename State, typename F>
-        struct result_of_it_reverse_iter_fold<0,It,State,F
-          , typename boost::enable_if_has_type<BOOST_FUSION_FOLD_IMPL_ENABLER(State)>::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , true
-# endif
-          >
+        template<typename Result,int N>
+        struct unrolled_reverse_iter_fold
         {
-            typedef typename State::type type;
+            template<typename State3, typename It3, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_3(State3 const& state3,It3 const& it3,F& f)
+            {
+                return unrolled_reverse_iter_fold<
+                    Result
+                  , N-4
+                >::call(
+                    f(state3,it3),
+                    fusion::prior(it3),
+                    f);
+            }
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return call_3(
+                    f(state2,it2),
+                    fusion::prior(it2),
+                    f);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
+            }
         };
-        template<int SeqSize, typename It, typename State, typename F>
-        struct result_of_it_reverse_iter_fold<SeqSize,It,State,F
-          , typename boost::enable_if_has_type<
-# if BOOST_WORKAROUND (BOOST_MSVC, >= 1500)
-                
-                
-                
-                typename boost::disable_if_c<SeqSize == 0, State>::type::type
-# else
-                BOOST_FUSION_FOLD_IMPL_ENABLER(State)
-# endif
-            >::type
-# if BOOST_WORKAROUND (BOOST_MSVC, < 1500)
-          , false
-# endif
-          >
-          : result_of_it_reverse_iter_fold<
-                SeqSize-1
-              , typename result_of::prior<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        It const&
-                    )
-                >
-              , F
-            >
-        {};
-        template<typename It, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_it_reverse_iter_fold<
-            0
-          , It
-          , State
+        template<typename Result>
+        struct unrolled_reverse_iter_fold<Result,3>
+        {
+            template<typename State2, typename It2, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_2(State2 const& state2,It2 const& it2,F& f)
+            {
+                return f(state2,it2);
+            }
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return call_2(
+                    f(state1,it1),
+                    fusion::prior(it1),
+                    f);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_iter_fold<Result,2>
+        {
+            template<typename State1, typename It1, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call_1(State1 const& state1,It1 const& it1,F& f)
+            {
+                return f(state1,it1);
+            }
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return call_1(
+                    f(state,it0),
+                    fusion::prior(it0),
+                    f);
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_iter_fold<Result,1>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const& it0,F f)
+            {
+                return f(state,
+                    it0);
+            }
+        };
+        template<typename Result>
+        struct unrolled_reverse_iter_fold<Result,0>
+        {
+            template<typename State, typename It0, typename F>
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static Result
+            call(State const& state,It0 const&, F)
+            {
+                return static_cast<Result>(state);
+            }
+        };
+        template<typename StateRef, typename It0, typename F, int N>
+        struct result_of_unrolled_reverse_iter_fold
+        {
+            typedef typename
+                reverse_iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::prior<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                reverse_iter_fold_lvalue_state<
+                    rest1
+                  , it1
+                  , F
+                >::type
+            rest2;
+            typedef typename
+                result_of::prior<it1>::type
+            it2;
+            typedef typename
+                reverse_iter_fold_lvalue_state<
+                    rest2
+                  , it2
+                  , F
+                >::type
+            rest3;
+            typedef typename
+                result_of::prior<it2>::type
+            it3;
+            typedef typename
+                result_of_unrolled_reverse_iter_fold<
+                    typename reverse_iter_fold_lvalue_state<
+                        rest3
+                      , it3
+                      , F
+                    >::type
+                  , typename result_of::prior<
+                        it3
+                    >::type
+                  , F
+                  , N-4
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_iter_fold<
+            StateRef
+          , It0
           , F
-        >::type
-        it_reverse_iter_fold(mpl::int_<0>, It const&, typename State::type state, F&)
+          , 3
+        >
         {
-            return state;
-        }
-        template<typename It, typename State, typename F, int SeqSize>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename lazy_enable_if_c<
-            SeqSize != 0
-          , result_of_it_reverse_iter_fold<
-                SeqSize
-              , It
-              , State
+            typedef typename
+                reverse_iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+            rest1;
+            typedef typename
+                result_of::prior<
+                    It0 const
+                >::type
+            it1;
+            typedef typename
+                reverse_iter_fold_lvalue_state<
+                    typename reverse_iter_fold_lvalue_state<
+                        rest1
+                      , it1
+                      , F
+                    >::type
+                  , typename result_of::prior<
+                        it1 const
+                    >::type const
+                  , F
+                >::type
+            type;
+        };
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 2
+        >
+          : reverse_iter_fold_lvalue_state<
+                typename reverse_iter_fold_lvalue_state<
+                    StateRef
+                  , It0 const
+                  , F
+                >::type
+              , typename result_of::prior<
+                    It0 const
+                >::type const
               , F
             >
-        >::type
-        it_reverse_iter_fold(mpl::int_<SeqSize>, It const& it, typename State::type state, F& f)
-        {
-            return it_reverse_iter_fold<
-                typename result_of::prior<It>::type
-              , boost::result_of<
-                    F(
-                        typename add_reference<typename State::type>::type,
-                        It const&
-                    )
-                >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 1
+        >
+          : reverse_iter_fold_lvalue_state<
+                StateRef
+              , It0 const
               , F
-            >(
-                mpl::int_<SeqSize-1>()
-              , fusion::prior(it)
-              , f(state, it)
-              , f
-            );
-        }
-        template<typename Seq, typename State, typename F
-          , bool = traits::is_sequence<Seq>::value
-          , bool = traits::is_segmented<Seq>::value>
+            >
+        {};
+        template<typename StateRef, typename It0, typename F>
+        struct result_of_unrolled_reverse_iter_fold<
+            StateRef
+          , It0
+          , F
+          , 0
+        >
+        {
+            typedef StateRef type;
+        };
+        template<typename StateRef, typename It0, typename F, int SeqSize>
+        struct result_of_first_unrolledreverse_iter_fold
+        {
+            typedef typename
+                result_of_unrolled_reverse_iter_fold<
+                    typename fusion::detail::result_of_with_decltype<
+                        F(
+                            StateRef,
+                            It0 const&
+                        )
+                    >::type
+                  , typename result_of::prior<
+                        It0 const
+                    >::type
+                  , F
+                  , SeqSize-1
+                >::type
+            type;
+        };
+        template<int SeqSize, typename StateRef, typename Seq, typename F>
+        struct reverse_iter_fold_impl
+        {
+            typedef typename
+                result_of_first_unrolledreverse_iter_fold<
+                    StateRef
+                  , typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
+                  , F
+                  , SeqSize
+                >::type
+            type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static type
+            call(StateRef state, Seq& seq, F f)
+            {
+                typedef
+                    unrolled_reverse_iter_fold<
+                        type
+                      , SeqSize
+                    >
+                unrolled_impl;
+                return unrolled_impl::call(
+                    state,
+                    fusion::prior( fusion::end(seq)),
+                    f);
+            }
+        };
+        template<typename StateRef, typename Seq, typename F>
+        struct reverse_iter_fold_impl<0,StateRef,Seq,F>
+        {
+            typedef StateRef type;
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            static StateRef
+            call(StateRef state, Seq&, F)
+            {
+                return static_cast<StateRef>(state);
+            }
+        };
+        template<typename Seq, typename State, typename F, bool IsSegmented>
         struct result_of_reverse_iter_fold
-        {};
-        template<typename Seq, typename State, typename F>
-        struct result_of_reverse_iter_fold<Seq, State, F, true, false>
-          : result_of_it_reverse_iter_fold<
+          : reverse_iter_fold_impl<
                 result_of::size<Seq>::value
-              , typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
-              , add_reference<State>
+              , typename add_reference<
+                    typename add_const<State>::type
+                >::type
+              , Seq
               , F
             >
         {};
-        template<typename Seq, typename State, typename F>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        inline typename result_of_reverse_iter_fold<Seq, State, F>::type
-        reverse_iter_fold(Seq& seq, State& state, F& f)
-        {
-            return it_reverse_iter_fold<
-                typename fusion::result_of::prior< typename result_of::end<Seq>::type >::type
-              , add_reference<State>
-              , F
-            >(
-                typename result_of::size<Seq>::type()
-              , fusion::prior( fusion::end(seq) )
-              , state
-              , f
-            );
-        }
     }
     namespace result_of
     {
         template<typename Seq, typename State, typename F>
         struct reverse_iter_fold
-          : detail::result_of_reverse_iter_fold<Seq, State, F>
+          : detail::result_of_reverse_iter_fold<
+                Seq
+              , State
+              , F
+              , traits::is_segmented<Seq>::type::value
+            >
         {};
     }
     template<typename Seq, typename State, typename F>
@@ -150,7 +357,10 @@ namespace boost { namespace fusion
     >::type
     reverse_iter_fold(Seq& seq, State const& state, F f)
     {
-        return detail::reverse_iter_fold<Seq, State const, F>(seq, state, f);
+        return result_of::reverse_iter_fold<Seq,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
@@ -161,28 +371,37 @@ namespace boost { namespace fusion
     >::type
     reverse_iter_fold(Seq const& seq, State const& state, F f)
     {
-        return detail::reverse_iter_fold<Seq const, State const, F>(seq, state, f);
+        return result_of::reverse_iter_fold<Seq const,State const,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     reverse_iter_fold(Seq& seq, State& state, F f)
     {
-        return detail::reverse_iter_fold<Seq, State, F>(seq, state, f);
+        return result_of::reverse_iter_fold<Seq,State,F>::call(
+            state,
+            seq,
+            f);
     }
     template<typename Seq, typename State, typename F>
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     reverse_iter_fold(Seq const& seq, State& state, F f)
     {
-        return detail::reverse_iter_fold<Seq const, State, F>(seq, state, f);
+        return result_of::reverse_iter_fold<Seq const,State,F>::call(
+            state,
+            seq,
+            f);
     }
 }}

include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp

@@ -10,7 +10,6 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/algorithm/iteration/fold_fwd.hpp>
 #include <boost/fusion/support/segmented_fold_until.hpp>
-#include <boost/mpl/bool.hpp>
 
 namespace boost { namespace fusion { namespace detail
 {
@@ -39,11 +38,11 @@ namespace boost { namespace fusion { namespace detail
     };
 
     // The default implementation of this lives in detail/fold.hpp
-    template <typename Sequence, typename State, typename Fun, bool IsSequence, bool IsSegmented>
+    template <typename Sequence, typename State, typename Fun, bool IsSegmented>
     struct result_of_fold;
 
     template <typename Sequence, typename State, typename Fun>
-    struct result_of_fold<Sequence, State, Fun, true, true>
+    struct result_of_fold<Sequence, State, Fun, true>
     {
         typedef
             typename result_of::segmented_fold_until<
@@ -54,7 +53,7 @@ namespace boost { namespace fusion { namespace detail
         type;
 
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        static type call(Sequence& seq, State& state, Fun& fun)
+        static type call(State& state, Sequence& seq, Fun fun)
         {
             return fusion::segmented_fold_until(seq, state, segmented_fold_fun<Fun>(fun));
         }

include/boost/fusion/algorithm/iteration/fold.hpp

@@ -2,7 +2,6 @@
     Copyright (c) 2001-2011 Joel de Guzman
     Copyright (c) 2007 Dan Marsden
     Copyright (c) 2009-2010 Christopher Schmidt
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -11,17 +10,24 @@
 #define BOOST_FUSION_ALGORITHM_ITERATION_FOLD_HPP
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/support/detail/result_of.hpp>
 #include <boost/fusion/algorithm/iteration/fold_fwd.hpp>
 #include <boost/config.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/support/is_segmented.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/iterator/next.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)

include/boost/fusion/algorithm/iteration/fold_fwd.hpp

@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     fold(Seq& seq, State& state, F f);
@@ -47,7 +47,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     fold(Seq const& seq, State& state, F f);

include/boost/fusion/algorithm/iteration/iter_fold.hpp

@@ -1,7 +1,6 @@
 /*=============================================================================
     Copyright (c) 2010 Christopher Schmidt
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -14,14 +13,20 @@
 #include <boost/fusion/algorithm/iteration/iter_fold_fwd.hpp>
 #include <boost/config.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
+#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/support/is_segmented.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/support/detail/result_of.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
+#include <boost/fusion/iterator/prior.hpp>
 #include <boost/fusion/iterator/next.hpp>
-#include <boost/utility/result_of.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 #define BOOST_FUSION_ITER_FOLD

include/boost/fusion/algorithm/iteration/iter_fold_fwd.hpp

@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     iter_fold(Seq& seq, State& state, F f);
@@ -47,7 +47,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     iter_fold(Seq const& seq, State& state, F f);

include/boost/fusion/algorithm/iteration/reverse_fold.hpp

@@ -1,7 +1,6 @@
 /*=============================================================================
     Copyright (c) 2010 Christopher Schmidt
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -11,17 +10,24 @@
 #define BOOST_FUSION_ALGORITHM_ITERATION_REVERSE_FOLD_HPP
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/support/detail/result_of.hpp>
 #include <boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp>
 #include <boost/config.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/support/is_segmented.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/prior.hpp>
+#include <boost/fusion/iterator/next.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 #define BOOST_FUSION_REVERSE_FOLD

include/boost/fusion/algorithm/iteration/reverse_fold_fwd.hpp

@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     reverse_fold(Seq& seq, State& state, F f);
@@ -47,7 +47,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     reverse_fold(Seq const& seq, State& state, F f);

include/boost/fusion/algorithm/iteration/reverse_iter_fold.hpp

@@ -1,7 +1,6 @@
 /*=============================================================================
     Copyright (c) 2010 Christopher Schmidt
     Copyright (c) 2001-2011 Joel de Guzman
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -10,17 +9,24 @@
 #define BOOST_FUSION_ALGORITHM_ITERATION_REVERSE_ITER_FOLD_HPP
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/support/detail/result_of.hpp>
 #include <boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp>
 #include <boost/config.hpp>
+#include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/support/is_segmented.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/value_of.hpp>
 #include <boost/fusion/iterator/prior.hpp>
+#include <boost/fusion/iterator/next.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 #define BOOST_FUSION_REVERSE_FOLD

include/boost/fusion/algorithm/iteration/reverse_iter_fold_fwd.hpp

@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
-      , State
+      , State const
       , F
     >::type
     reverse_iter_fold(Seq& seq, State& state, F f);
@@ -47,7 +47,7 @@ namespace boost { namespace fusion
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
-      , State
+      , State const
       , F
     >::type
     reverse_iter_fold(Seq const& seq, State& state, F f);

include/boost/fusion/algorithm/transformation/erase.hpp

@@ -10,6 +10,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/iterator/equal_to.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 #include <boost/fusion/view/joint_view/joint_view.hpp>
 #include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>

include/boost/fusion/algorithm/transformation/flatten.hpp

@@ -1,9 +1,9 @@
-/*==============================================================================
+/*//////////////////////////////////////////////////////////////////////////////
     Copyright (c) 2013 Jamboree
 
     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)
-==============================================================================*/
+//////////////////////////////////////////////////////////////////////////////*/
 #ifndef BOOST_FUSION_ALGORITHM_FLATTEN_HPP_INCLUDED
 #define BOOST_FUSION_ALGORITHM_FLATTEN_HPP_INCLUDED
 

include/boost/fusion/algorithm/transformation/insert.hpp

@@ -10,6 +10,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 #include <boost/fusion/view/joint_view/joint_view.hpp>
 #include <boost/fusion/view/single_view/single_view.hpp>
 #include <boost/fusion/view/iterator_range/iterator_range.hpp>

include/boost/fusion/algorithm/transformation/insert_range.hpp

@@ -9,6 +9,7 @@
 
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 #include <boost/fusion/view/joint_view/joint_view.hpp>
 #include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>

include/boost/fusion/algorithm/transformation/zip.hpp

@@ -17,7 +17,6 @@
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
 #include <boost/preprocessor/arithmetic/inc.hpp>

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

@@ -21,8 +21,6 @@
 // C++11 interface
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/container/deque/detail/keyed_element.hpp>
@@ -61,7 +59,7 @@ namespace boost { namespace fusion
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence>>, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence>>>::type* /*dummy*/ = 0) BOOST_NOEXCEPT
         {}
 
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
@@ -151,8 +149,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(Sequence const& seq
-          , typename disable_if<is_convertible<Sequence, Head>, detail::enabler_>::type = detail::enabler
-          , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+          , typename disable_if<is_convertible<Sequence, Head> >::type* /*dummy*/ = 0)
           : base(base::from_iterator(fusion::begin(seq)))
         {}
 

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

@@ -23,7 +23,8 @@
 # endif
 #endif
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
+// MSVC variadics at this point in time is not ready yet (ICE!)
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900))
 # if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
 #   undef BOOST_FUSION_HAS_VARIADIC_DEQUE
 # endif

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

@@ -1,7 +1,6 @@
 /*=============================================================================
     Copyright (c) 2005-2012 Joel de Guzman
     Copyright (c) 2005-2006 Dan Marsden
-    Copyright (c) 2015 Kohei Takahashi
 
     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)
@@ -13,7 +12,7 @@
 #include <boost/fusion/container/deque/convert.hpp>
 #include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/intrinsic/end.hpp>
+#include <boost/fusion/sequence/intrinsic/size.hpp>
 
 namespace boost { namespace fusion
 {
@@ -42,11 +41,7 @@ namespace boost { namespace fusion
                 BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
-                    return gen::call(fusion::begin(seq)
-#if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
-                        , fusion::end(seq)
-#endif
-                    );
+                    return gen::call(seq);
                 }
             };
         };

include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp

@@ -26,13 +26,7 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size>
-    struct as_deque
-    {
-        BOOST_STATIC_ASSERT_MSG(
-            size <= FUSION_MAX_DEQUE_SIZE
-          , "FUSION_MAX_DEQUE_SIZE limit is too low"
-        );
-    };
+    struct as_deque;
 
     template <>
     struct as_deque<0>

include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp

@@ -22,7 +22,6 @@ namespace boost { namespace fusion
     {
         template <typename Sequence>
         struct as_deque
-            : detail::as_deque<result_of::size<Sequence>::value>
         {
             typedef typename
                 detail::as_deque<result_of::size<Sequence>::value>

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

@@ -24,8 +24,6 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 #include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
 
 #include <boost/fusion/container/deque/deque_fwd.hpp>
 #include <boost/fusion/container/deque/detail/value_at_impl.hpp>
@@ -37,7 +35,6 @@
 #include <boost/mpl/bool.hpp>
 
 #include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 #include <boost/utility/enable_if.hpp>
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
@@ -104,12 +101,19 @@ namespace boost { namespace fusion {
 
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* /*dummy*/ = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
 
+        template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename U)>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
+
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -127,11 +131,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* /*dummy*/ = 0
          )
             : base(BOOST_FUSION_FWD_ELEM(T0_, t0), detail::nil_keyed_element())
             {}
@@ -144,8 +144,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         deque(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>&& seq
             , typename disable_if<
                   is_convertible<deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* /*dummy*/ = 0)
             : base(std::forward<deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>>(seq))
             {}
         template <typename T>
@@ -156,14 +155,6 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             base::operator=(BOOST_FUSION_FWD_ELEM(T, rhs));
             return *this;
         }
-        // This copy op= is required because move ctor deletes copy op=.
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 #endif
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
 FUSION_HASH endif
@@ -187,7 +178,7 @@ FUSION_HASH endif
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* /*dummy*/ = 0) BOOST_NOEXCEPT
         {}
 
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED

include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque10.hpp

@@ -201,11 +201,17 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             {}
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
+        template <typename U0 , typename U1 , typename U2 , typename U3 , typename U4 , typename U5 , typename U6 , typename U7 , typename U8 , typename U9>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -218,11 +224,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* = 0
          )
             : base(std::forward<T0_>( t0), detail::nil_keyed_element())
             {}
@@ -235,8 +237,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         deque(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9>&& seq
             , typename disable_if<
                   is_convertible<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* = 0)
             : base(std::forward<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9>>(seq))
             {}
         template <typename T>
@@ -247,14 +248,6 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             base::operator=(std::forward<T>( rhs));
             return *this;
         }
-        
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 # endif
     };
     template <>
@@ -272,7 +265,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* = 0) BOOST_NOEXCEPT
         {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque() BOOST_NOEXCEPT {}

include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque20.hpp

@@ -381,11 +381,17 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             {}
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
+        template <typename U0 , typename U1 , typename U2 , typename U3 , typename U4 , typename U5 , typename U6 , typename U7 , typename U8 , typename U9 , typename U10 , typename U11 , typename U12 , typename U13 , typename U14 , typename U15 , typename U16 , typename U17 , typename U18 , typename U19>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -398,11 +404,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* = 0
          )
             : base(std::forward<T0_>( t0), detail::nil_keyed_element())
             {}
@@ -415,8 +417,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         deque(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19>&& seq
             , typename disable_if<
                   is_convertible<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* = 0)
             : base(std::forward<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19>>(seq))
             {}
         template <typename T>
@@ -427,14 +428,6 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             base::operator=(std::forward<T>( rhs));
             return *this;
         }
-        
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 # endif
     };
     template <>
@@ -452,7 +445,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* = 0) BOOST_NOEXCEPT
         {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque() BOOST_NOEXCEPT {}

include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque30.hpp

@@ -561,11 +561,17 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             {}
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
+        template <typename U0 , typename U1 , typename U2 , typename U3 , typename U4 , typename U5 , typename U6 , typename U7 , typename U8 , typename U9 , typename U10 , typename U11 , typename U12 , typename U13 , typename U14 , typename U15 , typename U16 , typename U17 , typename U18 , typename U19 , typename U20 , typename U21 , typename U22 , typename U23 , typename U24 , typename U25 , typename U26 , typename U27 , typename U28 , typename U29>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -578,11 +584,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* = 0
          )
             : base(std::forward<T0_>( t0), detail::nil_keyed_element())
             {}
@@ -595,8 +597,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         deque(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29>&& seq
             , typename disable_if<
                   is_convertible<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* = 0)
             : base(std::forward<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29>>(seq))
             {}
         template <typename T>
@@ -607,14 +608,6 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             base::operator=(std::forward<T>( rhs));
             return *this;
         }
-        
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 # endif
     };
     template <>
@@ -632,7 +625,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* = 0) BOOST_NOEXCEPT
         {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque() BOOST_NOEXCEPT {}

include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque40.hpp

@@ -741,11 +741,17 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             {}
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
+        template <typename U0 , typename U1 , typename U2 , typename U3 , typename U4 , typename U5 , typename U6 , typename U7 , typename U8 , typename U9 , typename U10 , typename U11 , typename U12 , typename U13 , typename U14 , typename U15 , typename U16 , typename U17 , typename U18 , typename U19 , typename U20 , typename U21 , typename U22 , typename U23 , typename U24 , typename U25 , typename U26 , typename U27 , typename U28 , typename U29 , typename U30 , typename U31 , typename U32 , typename U33 , typename U34 , typename U35 , typename U36 , typename U37 , typename U38 , typename U39>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -758,11 +764,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* = 0
          )
             : base(std::forward<T0_>( t0), detail::nil_keyed_element())
             {}
@@ -775,8 +777,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         deque(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39>&& seq
             , typename disable_if<
                   is_convertible<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* = 0)
             : base(std::forward<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39>>(seq))
             {}
         template <typename T>
@@ -787,14 +788,6 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             base::operator=(std::forward<T>( rhs));
             return *this;
         }
-        
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 # endif
     };
     template <>
@@ -812,7 +805,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* = 0) BOOST_NOEXCEPT
         {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque() BOOST_NOEXCEPT {}

include/boost/fusion/container/deque/detail/cpp03/preprocessed/deque50.hpp

@@ -921,11 +921,17 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             {}
         template<typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        deque(Sequence const& seq
-            , typename disable_if<is_convertible<Sequence, T0>, detail::enabler_>::type = detail::enabler
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+        deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
+        template <typename U0 , typename U1 , typename U2 , typename U3 , typename U4 , typename U5 , typename U6 , typename U7 , typename U8 , typename U9 , typename U10 , typename U11 , typename U12 , typename U13 , typename U14 , typename U15 , typename U16 , typename U17 , typename U18 , typename U19 , typename U20 , typename U21 , typename U22 , typename U23 , typename U24 , typename U25 , typename U26 , typename U27 , typename U28 , typename U29 , typename U30 , typename U31 , typename U32 , typename U33 , typename U34 , typename U35 , typename U36 , typename U37 , typename U38 , typename U39 , typename U40 , typename U41 , typename U42 , typename U43 , typename U44 , typename U45 , typename U46 , typename U47 , typename U48 , typename U49>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque&
+        operator=(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39 , U40 , U41 , U42 , U43 , U44 , U45 , U46 , U47 , U48 , U49> const& rhs)
+        {
+            base::operator=(rhs);
+            return *this;
+        }
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
@@ -938,11 +944,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         template <typename T0_>
         BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
-          , typename enable_if<is_convertible<T0_, T0>, detail::enabler_>::type = detail::enabler
-          , typename disable_if_c<
-                boost::is_same<deque const, typename boost::remove_reference<T0_>::type const>::value
-              , detail::enabler_
-            >::type = detail::enabler
+          , typename enable_if<is_convertible<T0_, T0> >::type* = 0
          )
             : base(std::forward<T0_>( t0), detail::nil_keyed_element())
             {}
@@ -955,8 +957,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
         deque(deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39 , U40 , U41 , U42 , U43 , U44 , U45 , U46 , U47 , U48 , U49>&& seq
             , typename disable_if<
                   is_convertible<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39 , U40 , U41 , U42 , U43 , U44 , U45 , U46 , U47 , U48 , U49>, T0>
-                , detail::enabler_
-              >::type = detail::enabler)
+              >::type* = 0)
             : base(std::forward<deque<U0 , U1 , U2 , U3 , U4 , U5 , U6 , U7 , U8 , U9 , U10 , U11 , U12 , U13 , U14 , U15 , U16 , U17 , U18 , U19 , U20 , U21 , U22 , U23 , U24 , U25 , U26 , U27 , U28 , U29 , U30 , U31 , U32 , U33 , U34 , U35 , U36 , U37 , U38 , U39 , U40 , U41 , U42 , U43 , U44 , U45 , U46 , U47 , U48 , U49>>(seq))
             {}
         template <typename T>
@@ -967,14 +968,6 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             base::operator=(std::forward<T>( rhs));
             return *this;
         }
-        
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        deque&
-        operator=(deque const& rhs)
-        {
-            base::operator=(static_cast<base const&>(rhs));
-            return *this;
-        }
 # endif
     };
     template <>
@@ -992,7 +985,7 @@ deque(T_0 && t0 , T_1 && t1 , T_2 && t2 , T_3 && t3 , T_4 && t4 , T_5 && t5 , T_
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> >, detail::enabler_>::type = detail::enabler) BOOST_NOEXCEPT
+                  , result_of::empty<Sequence> > >::type* = 0) BOOST_NOEXCEPT
         {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque() BOOST_NOEXCEPT {}

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

@@ -13,11 +13,6 @@
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/iterator/next.hpp>
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && BOOST_WORKAROUND(BOOST_GCC, / 100 == 404)
-#include <boost/core/enable_if.hpp>
-#include <boost/type_traits/is_same.hpp>
-#endif
-
 namespace boost { namespace fusion
 {
     struct fusion_sequence_tag;
@@ -64,7 +59,7 @@ namespace boost { namespace fusion { namespace detail
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(keyed_element&& rhs)
-          : Rest(rhs.forward_base())
+          : Rest(BOOST_FUSION_FWD_ELEM(Rest, rhs.forward_base()))
           , value_(BOOST_FUSION_FWD_ELEM(Value, rhs.value_))
         {}
 #endif
@@ -95,7 +90,7 @@ namespace boost { namespace fusion { namespace detail
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         Rest&& forward_base() BOOST_NOEXCEPT
         {
-            return std::move(*static_cast<Rest*>(this));
+            return BOOST_FUSION_FWD_ELEM(Rest, *static_cast<Rest*>(this));
         }
 #endif
 
@@ -119,14 +114,9 @@ namespace boost { namespace fusion { namespace detail
         {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-#if BOOST_WORKAROUND(BOOST_GCC, / 100 == 404)
-        template <typename Value_, typename = typename enable_if<is_same<Value_, Value> >::type>
-#else
-        typedef Value Value_;
-#endif
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        keyed_element(Value_&& value, Rest&& rest)
-            : Rest(std::move(rest))
+        keyed_element(Value&& value, Rest&& rest)
+            : Rest(BOOST_FUSION_FWD_ELEM(Rest, rest))
             , value_(BOOST_FUSION_FWD_ELEM(Value, value))
         {}
 #endif
@@ -157,8 +147,8 @@ namespace boost { namespace fusion { namespace detail
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element& operator=(keyed_element&& rhs)
         {
-            base::operator=(rhs.forward_base());
-            value_ = std::move(rhs.value_);
+            base::operator=(std::forward<keyed_element>(rhs));
+            value_ = BOOST_FUSION_FWD_ELEM(Value, rhs.value_);
             return *this;
         }
 #endif

include/boost/fusion/container/generation/make_set.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 2014-2015 Kohei Takahashi
+    Copyright (c) 2014 Kohei Takahashi
 
     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)
@@ -10,46 +10,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/container/set/set.hpp>
 
-#if !defined(BOOST_FUSION_HAS_VARIADIC_SET)
 # include <boost/fusion/container/generation/detail/pp_make_set.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 variadic interface
-///////////////////////////////////////////////////////////////////////////////
-
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <utility>
-
-namespace boost { namespace fusion
-{
-    namespace result_of
-    {
-        template <typename ...T>
-        struct make_set
-        {
-            typedef set<
-                typename detail::as_fusion_element<
-                    typename remove_const<
-                        typename remove_reference<T>::type
-                    >::type
-                >::type...
-            > type;
-        };
-    }
-
-    template <typename ...T>
-    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::make_set<T...>::type
-    make_set(T&&... arg)
-    {
-        return typename result_of::make_set<T...>::type(std::forward<T>(arg)...);
-    }
- }}
-
 
 #endif
-#endif
 

include/boost/fusion/container/generation/make_vector.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 2014-2015 Kohei Takahashi
+    Copyright (c) 2014 Kohei Takahashi
 
     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)
@@ -10,46 +10,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/container/vector/vector.hpp>
 
-#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
 # include <boost/fusion/container/generation/detail/pp_make_vector.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 variadic interface
-///////////////////////////////////////////////////////////////////////////////
-
-#include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <utility>
-
-namespace boost { namespace fusion
-{
-    namespace result_of
-    {
-        template <typename ...T>
-        struct make_vector
-        {
-            typedef vector<
-                typename detail::as_fusion_element<
-                    typename remove_const<
-                        typename remove_reference<T>::type
-                    >::type
-                >::type...
-            > type;
-        };
-    }
-
-    template <typename ...T>
-    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline typename result_of::make_vector<T...>::type
-    make_vector(T&&... arg)
-    {
-        return typename result_of::make_vector<T...>::type(std::forward<T>(arg)...);
-    }
- }}
-
 
 #endif
-#endif
 

include/boost/fusion/container/generation/vector_tie.hpp

@@ -8,37 +8,8 @@
 #define FUSION_VECTOR_TIE_11112014_2302
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/container/vector/detail/config.hpp>
 
-#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR)
 # include <boost/fusion/container/generation/detail/pp_vector_tie.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 variadic interface
-///////////////////////////////////////////////////////////////////////////////
-
-namespace boost { namespace fusion
-{
-    namespace result_of
-    {
-        template <typename ...T>
-        struct vector_tie
-        {
-            typedef vector<T&...> type;
-        };
-    }
-
-    template <typename ...T>
-    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-    inline vector<T&...>
-    vector_tie(T&... arg)
-    {
-        return vector<T&...>(arg...);
-    }
- }}
-
 
 #endif
-#endif
 

include/boost/fusion/container/list/cons.hpp

@@ -9,8 +9,6 @@
 #define FUSION_CONS_07172005_0843
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 #include <boost/fusion/container/list/cons_fwd.hpp>
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
@@ -36,6 +34,7 @@
 
 namespace boost { namespace fusion
 {
+    struct void_;
     struct cons_tag;
     struct forward_traversal_tag;
     struct fusion_sequence_tag;
@@ -70,10 +69,6 @@ namespace boost { namespace fusion
         cons(cons<Car2, Cdr2> const& rhs)
             : car(rhs.car), cdr(rhs.cdr) {}
 
-#if BOOST_WORKAROUND(BOOST_GCC, / 100 == 406) && !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
-        // Workaround for `array used as initializer` compile error on gcc 4.6 w/ c++0x.
-        template <typename = void>
-#endif
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(cons const& rhs)
             : car(rhs.car), cdr(rhs.cdr) {}
@@ -87,8 +82,7 @@ namespace boost { namespace fusion
                     traits::is_sequence<Sequence>
                   , mpl::not_<is_base_of<cons, Sequence> >
                   , mpl::not_<is_convertible<Sequence, Car> > > // use copy to car instead
-              , detail::enabler_
-            >::type = detail::enabler
+            >::type* /*dummy*/ = 0
         )
             : car(*fusion::begin(seq))
             , cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {}

include/boost/fusion/container/list/detail/cpp03/list.hpp

@@ -8,8 +8,6 @@
 #define FUSION_LIST_07172005_1153
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 #include <boost/fusion/container/list/detail/cpp03/list_fwd.hpp>
 #include <boost/fusion/container/list/detail/cpp03/list_to_cons.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
@@ -63,7 +61,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
 
         //  Expand a couple of forwarding constructors for arguments

include/boost/fusion/container/list/detail/cpp03/preprocessed/list10.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
         
         

include/boost/fusion/container/list/detail/cpp03/preprocessed/list20.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
         
         

include/boost/fusion/container/list/detail/cpp03/preprocessed/list30.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
         
         

include/boost/fusion/container/list/detail/cpp03/preprocessed/list40.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
         
         

include/boost/fusion/container/list/detail/cpp03/preprocessed/list50.hpp

@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
         
         

include/boost/fusion/container/map/detail/cpp03/as_map.hpp

@@ -25,13 +25,7 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size, bool is_assoc>
-    struct as_map
-    {
-        BOOST_STATIC_ASSERT_MSG(
-            size <= FUSION_MAX_MAP_SIZE
-          , "FUSION_MAX_MAP_SIZE limit is too low"
-        );
-    };
+    struct as_map;
 
     template <bool is_assoc>
     struct as_map<0, is_assoc>

include/boost/fusion/container/map/detail/map_impl.hpp

@@ -125,7 +125,11 @@ namespace boost { namespace fusion { namespace detail
         }
 
         BOOST_FUSION_GPU_ENABLED
-        mpl::identity<value_type> get_val(mpl::identity<key_type>) const;
+        value_type get_val(mpl::identity<key_type>);
+        BOOST_FUSION_GPU_ENABLED
+        pair_type get_val(mpl::int_<index>);
+        BOOST_FUSION_GPU_ENABLED
+        value_type get_val(mpl::identity<key_type>) const;
         BOOST_FUSION_GPU_ENABLED
         pair_type get_val(mpl::int_<index>) const;
 

include/boost/fusion/container/map/detail/value_at_key_impl.hpp

@@ -1,6 +1,5 @@
 /*=============================================================================
     Copyright (c) 2001-2013 Joel de Guzman
-    Copyright (c) 2018 Kohei Takahashi
 
     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)
@@ -9,6 +8,10 @@
 #define BOOST_FUSION_MAP_DETAIL_VALUE_AT_KEY_IMPL_02042013_0821
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/support/detail/access.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/utility/declval.hpp>
 
 namespace boost { namespace fusion
@@ -26,9 +29,9 @@ namespace boost { namespace fusion
             template <typename Sequence, typename Key>
             struct apply
             {
-                typedef typename BOOST_FUSION_IDENTIFIED_TYPE((
-                    boost::declval<Sequence>().get_val(mpl::identity<Key>())
-                )) type;
+                typedef
+                    decltype(boost::declval<Sequence>().get_val(mpl::identity<Key>()))
+                type;
             };
         };
     }

include/boost/fusion/container/map/map.hpp

@@ -35,8 +35,6 @@
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 
 #include <boost/utility/enable_if.hpp>
 
@@ -67,21 +65,24 @@ namespace boost { namespace fusion
           : base_type(std::forward<map>(seq))
         {}
 
-        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
+        template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence const& seq)
+        map(Sequence const& seq
+          , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
-        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
+        template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence& seq)
+        map(Sequence& seq
+          , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
-        template <typename Sequence, typename = typename enable_if<traits::is_sequence<Sequence>>::type>
+        template <typename Sequence>
         BOOST_FUSION_GPU_ENABLED
-        map(Sequence&& seq)
+        map(Sequence&& seq
+          , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 

include/boost/fusion/container/map/map_fwd.hpp

@@ -23,7 +23,8 @@
 # endif
 #endif
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
+// MSVC variadics at this point in time is not ready yet (ICE!)
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1900))
 # if defined(BOOST_FUSION_HAS_VARIADIC_MAP)
 #   undef BOOST_FUSION_HAS_VARIADIC_MAP
 # endif

include/boost/fusion/container/set/detail/as_set.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 2014-2015 Kohei Takahashi
+    Copyright (c) 2014 Kohei Takahashi
 
     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)
@@ -13,55 +13,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Without variadics, we will use the PP version
 ///////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_FUSION_HAS_VARIADIC_SET)
 # include <boost/fusion/container/set/detail/cpp03/as_set.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 interface
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/fusion/support/detail/index_sequence.hpp>
-#include <boost/fusion/container/set/set.hpp>
-#include <boost/fusion/iterator/value_of.hpp>
-#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/iterator/advance.hpp>
-#include <cstddef>
-
-namespace boost { namespace fusion { namespace detail
-{
-BOOST_FUSION_BARRIER_BEGIN
-
-    template <int size
-            , typename = typename detail::make_index_sequence<size>::type>
-    struct as_set;
-
-    template <int size, std::size_t ...Indices>
-    struct as_set<size, detail::index_sequence<Indices...> >
-    {
-        template <typename I>
-        struct apply
-        {
-            typedef set<
-                typename result_of::value_of<
-                    typename result_of::advance_c<I, Indices>::type
-                >::type...
-            > type;
-        };
-
-        template <typename Iterator>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        static typename apply<Iterator>::type
-        call(Iterator const& i)
-        {
-            typedef apply<Iterator> gen;
-            typedef typename gen::type result;
-            return result(*advance_c<Indices>(i)...);
-        }
-    };
-
-BOOST_FUSION_BARRIER_END
-}}}
 
 #endif
-#endif
 

include/boost/fusion/container/set/detail/convert_impl.hpp

@@ -29,7 +29,7 @@ namespace boost { namespace fusion
             template <typename Sequence>
             struct apply
             {
-                typedef detail::as_set<result_of::size<Sequence>::value> gen;
+                typedef typename detail::as_set<result_of::size<Sequence>::value> gen;
                 typedef typename gen::
                     template apply<typename result_of::begin<Sequence>::type>::type
                 type;

include/boost/fusion/container/set/detail/cpp03/as_set.hpp

@@ -25,13 +25,7 @@ namespace boost { namespace fusion { namespace detail
 BOOST_FUSION_BARRIER_BEGIN
 
     template <int size>
-    struct as_set
-    {
-        BOOST_STATIC_ASSERT_MSG(
-            size <= FUSION_MAX_SET_SIZE
-          , "FUSION_MAX_SET_SIZE limit is too low"
-        );
-    };
+    struct as_set;
 
     template <>
     struct as_set<0>

include/boost/fusion/container/set/detail/cpp03/preprocessed/set10.hpp

@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
     template <typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9>
     struct set : sequence_base<set<T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9> >
@@ -26,7 +27,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     explicit

include/boost/fusion/container/set/detail/cpp03/preprocessed/set20.hpp

@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
     template <typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19>
     struct set : sequence_base<set<T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19> >
@@ -26,7 +27,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     explicit

include/boost/fusion/container/set/detail/cpp03/preprocessed/set30.hpp

@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
     template <typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19 , typename T20 , typename T21 , typename T22 , typename T23 , typename T24 , typename T25 , typename T26 , typename T27 , typename T28 , typename T29>
     struct set : sequence_base<set<T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19 , T20 , T21 , T22 , T23 , T24 , T25 , T26 , T27 , T28 , T29> >
@@ -26,7 +27,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     explicit

include/boost/fusion/container/set/detail/cpp03/preprocessed/set40.hpp

@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
     template <typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19 , typename T20 , typename T21 , typename T22 , typename T23 , typename T24 , typename T25 , typename T26 , typename T27 , typename T28 , typename T29 , typename T30 , typename T31 , typename T32 , typename T33 , typename T34 , typename T35 , typename T36 , typename T37 , typename T38 , typename T39>
     struct set : sequence_base<set<T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19 , T20 , T21 , T22 , T23 , T24 , T25 , T26 , T27 , T28 , T29 , T30 , T31 , T32 , T33 , T34 , T35 , T36 , T37 , T38 , T39> >
@@ -26,7 +27,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     explicit

include/boost/fusion/container/set/detail/cpp03/preprocessed/set50.hpp

@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
     template <typename T0 , typename T1 , typename T2 , typename T3 , typename T4 , typename T5 , typename T6 , typename T7 , typename T8 , typename T9 , typename T10 , typename T11 , typename T12 , typename T13 , typename T14 , typename T15 , typename T16 , typename T17 , typename T18 , typename T19 , typename T20 , typename T21 , typename T22 , typename T23 , typename T24 , typename T25 , typename T26 , typename T27 , typename T28 , typename T29 , typename T30 , typename T31 , typename T32 , typename T33 , typename T34 , typename T35 , typename T36 , typename T37 , typename T38 , typename T39 , typename T40 , typename T41 , typename T42 , typename T43 , typename T44 , typename T45 , typename T46 , typename T47 , typename T48 , typename T49>
     struct set : sequence_base<set<T0 , T1 , T2 , T3 , T4 , T5 , T6 , T7 , T8 , T9 , T10 , T11 , T12 , T13 , T14 , T15 , T16 , T17 , T18 , T19 , T20 , T21 , T22 , T23 , T24 , T25 , T26 , T27 , T28 , T29 , T30 , T31 , T32 , T33 , T34 , T35 , T36 , T37 , T38 , T39 , T40 , T41 , T42 , T43 , T44 , T45 , T46 , T47 , T48 , T49> >
@@ -26,7 +27,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
     BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     explicit

include/boost/fusion/container/set/detail/cpp03/set.hpp

@@ -8,8 +8,6 @@
 #define FUSION_SET_09162005_1104
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/support/sequence_base.hpp>
 #include <boost/fusion/support/category_of.hpp>
@@ -49,6 +47,7 @@
 
 namespace boost { namespace fusion
 {
+    struct void_;
     struct fusion_sequence_tag;
 
     template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_SET_SIZE, typename T)>
@@ -73,7 +72,7 @@ namespace boost { namespace fusion
         template <typename Sequence>
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
-            , typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler)
+            , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
 
         #include <boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp>

include/boost/fusion/container/set/detail/value_of_data_impl.hpp

@@ -9,6 +9,7 @@
 #define BOOST_FUSION_CONTAINER_SET_DETAIL_VALUE_OF_DATA_IMPL_HPP
 
 #include <boost/fusion/support/config.hpp>
+#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
 
 namespace boost { namespace fusion { namespace extension
 {

include/boost/fusion/container/set/set.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 2014-2015 Kohei Takahashi
+    Copyright (c) 2014 Kohei Takahashi
 
     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)
@@ -13,128 +13,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Without variadics, we will use the PP version
 ///////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_FUSION_HAS_VARIADIC_SET)
 # include <boost/fusion/container/set/detail/cpp03/set.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 interface
-///////////////////////////////////////////////////////////////////////////////
-#include <boost/fusion/support/detail/access.hpp>
-#include <boost/fusion/support/void.hpp>
-#include <boost/fusion/support/detail/enabler.hpp>
-#include <boost/fusion/support/sequence_base.hpp>
-#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/is_sequence.hpp>
-#include <boost/fusion/support/detail/is_same_size.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/container/set/detail/begin_impl.hpp>
-#include <boost/fusion/container/set/detail/end_impl.hpp>
-#include <boost/fusion/container/set/detail/value_of_impl.hpp>
-#include <boost/fusion/container/set/detail/deref_data_impl.hpp>
-#include <boost/fusion/container/set/detail/deref_impl.hpp>
-#include <boost/fusion/container/set/detail/key_of_impl.hpp>
-#include <boost/fusion/container/set/detail/value_of_data_impl.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/core/enable_if.hpp>
-
-namespace boost { namespace fusion
-{
-    struct fusion_sequence_tag;
-
-    template <>
-    struct set<> : sequence_base<set<> >
-    {
-        struct category : forward_traversal_tag, associative_tag {};
-
-        typedef set_tag fusion_tag;
-        typedef fusion_sequence_tag tag; // this gets picked up by MPL
-        typedef mpl::false_ is_view;
-
-        typedef vector<> storage_type;
-
-        typedef storage_type::size size;
-
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        set()
-            : data() {}
-
-        template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
-        set(Sequence const& rhs,
-            typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler,
-            typename enable_if<detail::is_same_size<Sequence, storage_type>, detail::enabler_>::type = detail::enabler)
-            : data(rhs) {}
-
-        template <typename T>
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        set&
-        operator=(T const& rhs)
-        {
-            data = rhs;
-            return *this;
-        }
-
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        storage_type& get_data() { return data; }
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        storage_type const& get_data() const { return data; }
-
-    private:
-        storage_type data;
-    };
-
-    template <typename ...T>
-    struct set : sequence_base<set<T...> >
-    {
-        struct category : forward_traversal_tag, associative_tag {};
-
-        typedef set_tag fusion_tag;
-        typedef fusion_sequence_tag tag; // this gets picked up by MPL
-        typedef mpl::false_ is_view;
-
-        typedef vector<T...> storage_type;
-
-        typedef typename storage_type::size size;
-
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        set()
-            : data() {}
-
-        template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
-        set(Sequence&& rhs,
-            typename enable_if<traits::is_sequence<Sequence>, detail::enabler_>::type = detail::enabler,
-            typename enable_if<detail::is_same_size<Sequence, storage_type>, detail::enabler_>::type = detail::enabler)
-            : data(std::forward<Sequence>(rhs)) {}
-
-        template <typename ...U>
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit
-        set(U&& ...args)
-            : data(std::forward<U>(args)...) {}
-
-        template <typename U>
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        set&
-        operator=(U&& rhs)
-        {
-            data = std::forward<U>(rhs);
-            return *this;
-        }
-
-        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        storage_type& get_data() { return data; }
-        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        storage_type const& get_data() const { return data; }
-
-    private:
-        storage_type data;
-    };
-
-}}
 
 #endif
-#endif
 
 

include/boost/fusion/container/set/set_fwd.hpp

@@ -9,38 +9,11 @@
 
 #include <boost/config.hpp>
 #include <boost/fusion/support/config.hpp>
-#include <boost/fusion/container/vector/detail/config.hpp>
-
-#if !defined(BOOST_FUSION_HAS_VARIADIC_VECTOR) \
-  || (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-# if defined(BOOST_FUSION_HAS_VARIADIC_SET)
-#   undef BOOST_FUSION_HAS_VARIADIC_SET
-# endif
-#else
-# if !defined(BOOST_FUSION_HAS_VARIADIC_SET)
-#   define BOOST_FUSION_HAS_VARIADIC_SET
-# endif
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // With no variadics, we will use the C++03 version
 ///////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_FUSION_HAS_VARIADIC_SET)
 # include <boost/fusion/container/set/detail/cpp03/set_fwd.hpp>
-#else
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 interface
-///////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace fusion
-{
-    struct set_tag;
-    struct set_iterator_tag;
-
-    template <typename ...T>
-    struct set;
-}}
 
 #endif
-#endif