diff options
Diffstat (limited to 'boost/fusion/container/generation/map_tie.hpp')
-rw-r--r-- | boost/fusion/container/generation/map_tie.hpp | 136 |
1 files changed, 24 insertions, 112 deletions
diff --git a/boost/fusion/container/generation/map_tie.hpp b/boost/fusion/container/generation/map_tie.hpp index 26fc2dfa82..4a988d4283 100644 --- a/boost/fusion/container/generation/map_tie.hpp +++ b/boost/fusion/container/generation/map_tie.hpp @@ -1,136 +1,48 @@ /*============================================================================= - Copyright (c) 2001-2011 Joel de Guzman - Copyright (c) 2006 Dan Marsden + 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_MAP_TIE_20060814_1116) -#define FUSION_MAP_TIE_20060814_1116 +#if !defined(FUSION_MAP_TIE_07222005_1247) +#define FUSION_MAP_TIE_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/container/map/limits.hpp> -#include <boost/fusion/support/pair.hpp> -#include <boost/fusion/container/generation/pair_tie.hpp> -#include <boost/type_traits/add_reference.hpp> -#if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES) -#include <boost/fusion/container/generation/detail/preprocessed/map_tie.hpp> +#if !defined(BOOST_FUSION_HAS_VARIADIC_MAP) +# include <boost/fusion/container/generation/detail/pp_map_tie.hpp> #else -#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES) -#pragma wave option(preserve: 2, line: 0, output: "detail/preprocessed/map_tie" 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/pair.hpp> namespace boost { namespace fusion { - struct void_; - namespace result_of { - template < - BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( - FUSION_MAX_MAP_SIZE, typename K, void_) - , BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT( - FUSION_MAX_MAP_SIZE, typename D, void_) - , typename Extra = void_ - > - struct map_tie; - - template <> - struct map_tie<> + template <typename ...Key> + struct map_tie { - typedef map<> type; + template <typename ...T> + struct apply + { + typedef map<fusion::pair<Key, T&>...> type; + }; }; } - inline map<> - map_tie() + template <typename ...Key, typename ...T> + BOOST_FUSION_GPU_ENABLED + inline map<fusion::pair<Key, T&>...> + map_tie(T&... arg) { - return map<>(); + typedef map<fusion::pair<Key, T&>...> result_type; + return result_type(arg...); } + }} -#define BOOST_FUSION_TIED_PAIR(z, n, data) \ - fusion::pair< \ - BOOST_PP_CAT(K, n) \ - , typename add_reference<BOOST_PP_CAT(D, n)>::type> - -#define BOOST_FUSION_PAIR_TIE(z, n, data) \ - fusion::pair_tie<BOOST_PP_CAT(K, n)>(BOOST_PP_CAT(_, n)) \ - -#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/map_tie.hpp> -#define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_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 map_tie<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D) BOOST_PP_REPEAT_FROM_TO(N, FUSION_MAX_MAP_SIZE, TEXT, void_) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_MAP_SIZE, TEXT, void_)> - #undef TEXT -#else - struct map_tie<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D)> -#endif - { - typedef map<BOOST_PP_ENUM(N, BOOST_FUSION_TIED_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_TIED_PAIR, _)> - map_tie(BOOST_PP_ENUM_BINARY_PARAMS(N, D, & _)) - { - return map<BOOST_PP_ENUM(N, BOOST_FUSION_TIED_PAIR, _)>( - BOOST_PP_ENUM(N, BOOST_FUSION_PAIR_TIE, _)); - } - -#undef N -#endif // defined(BOOST_PP_IS_ITERATING) - |