From 6ebc2e72ff0c97ed4899750749f2cc6c6938f3f4 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 26 Oct 2011 21:31:27 +0000 Subject: [PATCH] Unordered: Rename B0, B1 etc. to avoid macro clash. Refs #6062. [SVN r75123] --- include/boost/unordered/detail/emplace_args.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/unordered/detail/emplace_args.hpp b/include/boost/unordered/detail/emplace_args.hpp index a4365c21..9c1dfd3e 100644 --- a/include/boost/unordered/detail/emplace_args.hpp +++ b/include/boost/unordered/detail/emplace_args.hpp @@ -90,7 +90,7 @@ namespace boost { namespace unordered { namespace detail { { \ BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \ BOOST_PP_CAT(emplace_args, n) ( \ - BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, B, a) \ + BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, a) \ ) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \ {} \ \ @@ -112,8 +112,8 @@ namespace boost { namespace unordered { namespace detail { #if defined(BOOST_NO_RVALUE_REFERENCES) #define BOOST_UNORDERED_EARGS_MEMBER(z, n, _) \ - typedef BOOST_FWD_REF(BOOST_PP_CAT(A, n)) BOOST_PP_CAT(B, n); \ - BOOST_PP_CAT(B, n) BOOST_PP_CAT(a, n); + typedef BOOST_FWD_REF(BOOST_PP_CAT(A, n)) BOOST_PP_CAT(Arg, n); \ + BOOST_PP_CAT(Arg, n) BOOST_PP_CAT(a, n); #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ BOOST_PP_CAT(a, n)( \ @@ -123,8 +123,8 @@ namespace boost { namespace unordered { namespace detail { #define BOOST_UNORDERED_EARGS_MEMBER(z, n, _) \ typedef typename boost::add_lvalue_reference::type \ - BOOST_PP_CAT(B, n); \ - BOOST_PP_CAT(B, n) BOOST_PP_CAT(a, n); + BOOST_PP_CAT(Arg, n); \ + BOOST_PP_CAT(Arg, n) BOOST_PP_CAT(a, n); #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a, n))