diff options
Diffstat (limited to 'boost/fusion/container/generation/make_map.hpp')
| -rw-r--r-- | boost/fusion/container/generation/make_map.hpp | 144 |
1 files changed, 38 insertions, 106 deletions
diff --git a/boost/fusion/container/generation/make_map.hpp b/boost/fusion/container/generation/make_map.hpp index 08938d4c3c..d2eb16e22c 100644 --- a/boost/fusion/container/generation/make_map.hpp +++ b/boost/fusion/container/generation/make_map.hpp @@ -1,132 +1,64 @@ /*============================================================================= - Copyright (c) 2001-2011 Joel de Guzman + Copyright (c) 2001-2013 Joel de Guzman Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ -#ifndef BOOST_PP_IS_ITERATING #if !defined(FUSION_MAKE_MAP_07222005_1247) #define FUSION_MAKE_MAP_07222005_1247 -#include <boost/preprocessor/iterate.hpp> -#include <boost/preprocessor/repetition/enum_params.hpp> -#include <boost/preprocessor/repetition/enum_binary_params.hpp> -#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp> -#include <boost/preprocessor/repetition/repeat_from_to.hpp> +#include <boost/fusion/support/config.hpp> #include <boost/fusion/container/map/map.hpp> -#include <boost/fusion/support/detail/as_fusion_element.hpp> -#include <boost/fusion/support/pair.hpp> -#if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES) -#include <boost/fusion/container/generation/detail/preprocessed/make_map.hpp> +#if !defined(BOOST_FUSION_HAS_VARIADIC_MAP) +# include <boost/fusion/container/generation/detail/pp_make_map.hpp> #else -#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 2, line: 0, output: "detail/preprocessed/make_map" FUSION_MAX_MAP_SIZE_STR".hpp") -#endif - -/*============================================================================= - Copyright (c) 2001-2011 Joel de Guzman - - Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - This is an auto-generated file. Do not edit! -==============================================================================*/ -#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 1) -#endif +/////////////////////////////////////////////////////////////////////////////// +// C++11 variadic interface +/////////////////////////////////////////////////////////////////////////////// +#include <boost/fusion/support/detail/as_fusion_element.hpp> +#include <boost/fusion/support/pair.hpp> namespace boost { namespace fusion { - struct void_; - namespace result_of { - template < - BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( - FUSION_MAX_VECTOR_SIZE, typename K, void_) - , BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( - FUSION_MAX_VECTOR_SIZE, typename D, void_) - , typename Extra = void_ - > - struct make_map; - - template <> - struct make_map<> + template <typename ...Key> + struct make_map { - typedef map<> type; + template <typename ...T> + struct apply + { + typedef map< + fusion::pair< + Key + , typename detail::as_fusion_element<T>::type + >...> + type; + }; }; } - inline map<> - make_map() + template <typename ...Key, typename ...T> + BOOST_FUSION_GPU_ENABLED + inline map< + fusion::pair< + Key + , typename detail::as_fusion_element<T>::type + >...> + make_map(T const&... arg) { - return map<>(); + typedef map< + fusion::pair< + Key + , typename detail::as_fusion_element<T>::type + >...> + result_type; + + return result_type(arg...); } - -#define BOOST_FUSION_PAIR(z, n, data) \ - fusion::pair< \ - BOOST_PP_CAT(K, n) \ - , typename detail::as_fusion_element<BOOST_PP_CAT(D, n)>::type> - -#define BOOST_FUSION_MAKE_PAIR(z, n, data) \ - fusion::make_pair<BOOST_PP_CAT(K, n)>(BOOST_PP_CAT(_, n)) \ - -#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_map.hpp> -#define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE) -#include BOOST_PP_ITERATE() - -#undef BOOST_FUSION_PAIR -#undef BOOST_FUSION_MAKE_PAIR - -}} - -#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) -#pragma wave option(output: null) -#endif - -#endif // BOOST_FUSION_DONT_USE_PREPROCESSED_FILES + }} #endif -#else // defined(BOOST_PP_IS_ITERATING) -/////////////////////////////////////////////////////////////////////////////// -// -// Preprocessor vertical repetition code -// -/////////////////////////////////////////////////////////////////////////////// - -#define N BOOST_PP_ITERATION() - - namespace result_of - { - template < - BOOST_PP_ENUM_PARAMS(N, typename K) - , BOOST_PP_ENUM_PARAMS(N, typename D) - > -#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS) - #define TEXT(z, n, text) , text - struct make_map<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D) BOOST_PP_REPEAT_FROM_TO(N, FUSION_MAX_VECTOR_SIZE, TEXT, void_) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_VECTOR_SIZE, TEXT, void_)> - #undef TEXT -#else - struct make_map<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D)> #endif - { - typedef map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)> type; - }; - } - - template < - BOOST_PP_ENUM_PARAMS(N, typename K) - , BOOST_PP_ENUM_PARAMS(N, typename D) - > - inline map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)> - make_map(BOOST_PP_ENUM_BINARY_PARAMS(N, D, const& _)) - { - return map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)>( - BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_PAIR, _)); - } - -#undef N -#endif // defined(BOOST_PP_IS_ITERATING) - |