From ae23ffb8b6ed6fb6345e6071809755732f4b516b Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sun, 26 Oct 2014 16:47:41 +0900 Subject: [PATCH 1/5] Fix include guard mismatch Signed-off-by: Kohei Takahashi --- .../fusion/view/repetitive_view/repetitive_view_iterator.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp index 7d5d139d..b9f45d0c 100644 --- a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp +++ b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp @@ -5,8 +5,8 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ -#if !defined(BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED) -#define BOOST_FUSION_REPETITIVE_VIEW_HPP_ITERATOR_INCLUDED +#ifndef BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED +#define BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED #include #include From 90206f5da99dae23a66fdb688b56a6986236b2e9 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sun, 26 Oct 2014 17:21:11 +0900 Subject: [PATCH 2/5] Fix result type mismatch Signed-off-by: Kohei Takahashi --- include/boost/fusion/container/generation/make_deque.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/fusion/container/generation/make_deque.hpp b/include/boost/fusion/container/generation/make_deque.hpp index 20246f78..18e41304 100644 --- a/include/boost/fusion/container/generation/make_deque.hpp +++ b/include/boost/fusion/container/generation/make_deque.hpp @@ -27,7 +27,7 @@ namespace boost { namespace fusion template struct make_deque { - typedef deque type; + typedef deque::type...> type; }; } From 179e36fa422bad60587434e90e70a320a5d0259d Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Tue, 28 Oct 2014 14:24:48 +0900 Subject: [PATCH 3/5] Do not expand BOOST_NO_CXX11_RVALUE_REFERENCES while preprocessing. Signed-off-by: Kohei Takahashi --- preprocess/wave.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg index 3cde502f..d6744de0 100644 --- a/preprocess/wave.cfg +++ b/preprocess/wave.cfg @@ -12,6 +12,7 @@ -NBOOST_FORCEINLINE -NBOOST_CONSTEXPR -NBOOST_CXX14_CONSTEXPR +-NBOOST_NO_CXX11_RVALUE_REFERENCES -NBOOST_MPL_ASSERT -NBOOST_MPL_ASSERT_MSG -NBOOST_MPL_ASSERT_RELATION From 8dc502d33aab14997a1b49c2d6429ae55909db86 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Tue, 28 Oct 2014 14:25:04 +0900 Subject: [PATCH 4/5] Remove dup of internal macro Signed-off-by: Kohei Takahashi --- .../boost/fusion/container/generation/detail/pp_make_deque.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp index 843ae759..dccf13a6 100644 --- a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp +++ b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp @@ -66,9 +66,6 @@ namespace boost { namespace fusion #define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data) \ typename detail::as_fusion_element::type -#define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data) \ - typename detail::as_fusion_element::type - #define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE) #include BOOST_PP_ITERATE() From c6cb25846c156adb205224cbae07cf2fee3eae16 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Tue, 28 Oct 2014 18:29:48 +0900 Subject: [PATCH 5/5] Fix doc typo and describe about c++11 make_map. Signed-off-by: Kohei Takahashi --- doc/container.qbk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/container.qbk b/doc/container.qbk index 69df6f8f..d6b16c35 100644 --- a/doc/container.qbk +++ b/doc/container.qbk @@ -846,7 +846,7 @@ Create a __deque__ from one or more values. For C++11 compilers, the variadic function interface has no upper bound. -For C++11 compilers, the variadic function accepts `0` to +For C++03 compilers, the variadic function accepts `0` to `FUSION_MAX_DEQUE_SIZE` elements, where `FUSION_MAX_DEQUE_SIZE` is a user definable predefined maximum that defaults to `10`. You may define the preprocessor constant `FUSION_MAX_DEQUE_SIZE` before including any @@ -950,7 +950,9 @@ Create a __map__ from one or more key/data pairs. typename __result_of_make_map__::type make_map(T0 const& x0, T1 const& x1... TN const& xN); -The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements, +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 @@ -1475,7 +1477,9 @@ Returns the result type of __make_map__. , typename T0, typename T1,... typename TN> struct make_map; -The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements, +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