Subject: [Boost-commit] svn:boost r78534 - in branches/release: . boost boost/config/compiler boost/unordered boost/unordered/detail libs libs/unordered libs/unordered/doc
From: dnljms_at_[hidden]
Date: 2012-05-21 18:08:20
Author: danieljames
Date: 2012-05-21 18:08:19 EDT (Mon, 21 May 2012)
New Revision: 78534
URL: http://svn.boost.org/trac/boost/changeset/78534
Log:
Unordered: Fix bcp namespace fix. Fixes #6905.
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/config/compiler/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/unordered/ (props changed)
Text files modified:
branches/release/boost/unordered/detail/emplace_args.hpp | 16 ++++++++--------
branches/release/libs/unordered/doc/changes.qbk | 3 +++
2 files changed, 11 insertions(+), 8 deletions(-)
Modified: branches/release/boost/unordered/detail/emplace_args.hpp
==============================================================================
--- branches/release/boost/unordered/detail/emplace_args.hpp (original)
+++ branches/release/boost/unordered/detail/emplace_args.hpp 2012-05-21 18:08:19 EDT (Mon, 21 May 2012)
@@ -200,7 +200,7 @@
# define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \
template<typename T> \
- void construct_from_tuple(T* ptr, namespace_::tuple<>) \
+ void construct_from_tuple(T* ptr, namespace_ tuple<>) \
{ \
new ((void*) ptr) T(); \
} \
@@ -211,7 +211,7 @@
# define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, namespace_) \
template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \
void construct_from_tuple(T* ptr, \
- namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \
+ namespace_ tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \
{ \
new ((void*) ptr) T( \
BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_GET_TUPLE_ARG, namespace_) \
@@ -219,7 +219,7 @@
}
# define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_) \
- namespace_::get<n>(x)
+ namespace_ get<n>(x)
#else
@@ -229,7 +229,7 @@
template<typename T> \
void construct_from_tuple_impl( \
boost::unordered::detail::length<0>, T* ptr, \
- namespace_::tuple<>) \
+ namespace_ tuple<>) \
{ \
new ((void*) ptr) T(); \
} \
@@ -241,7 +241,7 @@
template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \
void construct_from_tuple_impl( \
boost::unordered::detail::length<n>, T* ptr, \
- namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \
+ namespace_ tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \
{ \
new ((void*) ptr) T( \
BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_GET_TUPLE_ARG, namespace_) \
@@ -249,14 +249,14 @@
}
# define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_) \
- namespace_::get<n>(x)
+ namespace_ get<n>(x)
#endif
-BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost)
+BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
#if !defined(__SUNPRO_CC) && !defined(BOOST_NO_0X_HDR_TUPLE)
- BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
+ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std::)
#endif
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE
Modified: branches/release/libs/unordered/doc/changes.qbk
==============================================================================
--- branches/release/libs/unordered/doc/changes.qbk (original)
+++ branches/release/libs/unordered/doc/changes.qbk 2012-05-21 18:08:19 EDT (Mon, 21 May 2012)
@@ -186,6 +186,9 @@
Fix some Sun specific code.
* [@https://svn.boost.org/trac/boost/ticket/6190 Ticket 6190]:
Avoid gcc's `-Wshadow` warning.
+* [@https://svn.boost.org/trac/boost/ticket/6905 Ticket 6905]:
+ Make namespaces in macros compatible with `bcp` custom namespaces.
+ Fixed by Luke Elliott.
* Remove some of the smaller prime number of buckets, as they may make
collisions quite probable (e.g. multiples of 5 are very common because
we used base 10).