Subject: [Boost-commit] svn:boost r74908 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-10-10 20:31:20
Author: danieljames
Date: 2011-10-10 20:31:19 EDT (Mon, 10 Oct 2011)
New Revision: 74908
URL: http://svn.boost.org/trac/boost/changeset/74908
Log:
Unordered: Some inspect fixes.
Text files modified:
trunk/boost/unordered/detail/allocator_helpers.hpp | 2 +-
trunk/boost/unordered/detail/emplace_args.hpp | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp (original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp 2011-10-10 20:31:19 EDT (Mon, 10 Oct 2011)
@@ -339,7 +339,7 @@
boost::unordered::detail::has_max_size<Alloc>::value, SizeType
>::type call_max_size(const Alloc&)
{
- return std::numeric_limits<SizeType>::max();
+ return (std::numeric_limits<SizeType>::max)();
}
template <typename Alloc>
Modified: trunk/boost/unordered/detail/emplace_args.hpp
==============================================================================
--- trunk/boost/unordered/detail/emplace_args.hpp (original)
+++ trunk/boost/unordered/detail/emplace_args.hpp 2011-10-10 20:31:19 EDT (Mon, 10 Oct 2011)
@@ -223,29 +223,29 @@
#if defined(BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT)
template <typename A, typename B, typename A0>
struct emulation1 {
- static choice1::type check(choice1, std::pair<A, B> const&);
- static choice2::type check(choice2, A const&);
- static choice3::type check(choice3, ...);
+ static choice1::type test(choice1, std::pair<A, B> const&);
+ static choice2::type test(choice2, A const&);
+ static choice3::type test(choice3, ...);
enum { value =
- sizeof(check(choose(), boost::unordered::detail::make<A0>())) ==
+ sizeof(test(choose(), boost::unordered::detail::make<A0>())) ==
sizeof(choice2::type) };
};
#endif
template <typename A, typename B, typename A0>
struct check3_base {
- static choice1::type check(choice1,
+ static choice1::type test(choice1,
boost::unordered::piecewise_construct_t);
#if defined(BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT)
- static choice2::type check(choice2, A const&);
+ static choice2::type test(choice2, A const&);
#endif
- static choice3::type check(choice3, ...);
+ static choice3::type test(choice3, ...);
enum { value =
- sizeof(check(choose(), boost::unordered::detail::make<A0>())) };
+ sizeof(test(choose(), boost::unordered::detail::make<A0>())) };
};
template <typename A, typename B, typename A0>