summaryrefslogtreecommitdiff
path: root/boost/fusion/container/generation/detail/pp_make_map.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/fusion/container/generation/detail/pp_make_map.hpp')
-rw-r--r--boost/fusion/container/generation/detail/pp_make_map.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/boost/fusion/container/generation/detail/pp_make_map.hpp b/boost/fusion/container/generation/detail/pp_make_map.hpp
index 062d3ac..ad20cd4 100644
--- a/boost/fusion/container/generation/detail/pp_make_map.hpp
+++ b/boost/fusion/container/generation/detail/pp_make_map.hpp
@@ -59,7 +59,8 @@ namespace boost { namespace fusion
};
}
- BOOST_FUSION_GPU_ENABLED inline map<>
+ BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+ inline map<>
make_map()
{
return map<>();
@@ -70,7 +71,7 @@ namespace boost { namespace fusion
BOOST_PP_CAT(K, n) \
, typename detail::as_fusion_element<BOOST_PP_CAT(D, n)>::type>
-#define BOOST_FUSION_MAKE_PAIR(z, n, data) \
+#define BOOST_FUSION_MAKE_PAIR(z, n, _) \
fusion::make_pair<BOOST_PP_CAT(K, n)>(BOOST_PP_CAT(_, n)) \
#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/detail/pp_make_map.hpp>
@@ -116,12 +117,12 @@ namespace boost { namespace fusion
BOOST_PP_ENUM_PARAMS(N, typename K)
, BOOST_PP_ENUM_PARAMS(N, typename D)
>
- BOOST_FUSION_GPU_ENABLED
+ BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
inline map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)>
- make_map(BOOST_PP_ENUM_BINARY_PARAMS(N, D, const& _))
+ make_map(BOOST_PP_ENUM_BINARY_PARAMS(N, D, const& arg))
{
return map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)>(
- BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_PAIR, _));
+ BOOST_PP_ENUM(N, BOOST_FUSION_MAKE_PAIR, arg));
}
#undef N