feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Unordered: Fix undefined macro warnings. Refs #6522.

Browse Source 
Just removing the rv reference stuff in extract_keys. I don't it's
needed anyway.

[SVN r76891]
This commit is contained in:
Daniel James
2012-02-05 08:44:22 +00:00
parent 51d2e2564e
commit 2e80a82554
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/unordered/detail/allocator_helpers.hpp
View File

@ -26,6 +26,10 @@
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/utility/addressof.hpp> #include <boost/utility/addressof.hpp>
#if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS)
#define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0
#endif
#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS #if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
# include <memory> # include <memory>
#endif #endif

15
include/boost/unordered/detail/extract_key.hpp
View File

@ -51,13 +51,6 @@ namespace detail {
return v; return v;
} }
#if BOOST_UNORDERED_USE_RV_REF
static key_type const& extract(BOOST_RV_REF(key_type) v)
{
return v;
}
#endif
static no_key extract() static no_key extract()
{ {
return no_key(); return no_key();
@ -69,7 +62,6 @@ namespace detail {
{ {
return no_key(); return no_key();
} }
#else #else
template <class Arg> template <class Arg>
static no_key extract(Arg const&) static no_key extract(Arg const&)
@ -106,13 +98,6 @@ namespace detail {
return v; return v;
} }
// TODO: Why does this cause errors?
//
//static key_type const& extract(BOOST_RV_REF(key_type) v)
//{
// return v;
//}
template <class Second> template <class Second>
static key_type const& extract(std::pair<key_type, Second> const& v) static key_type const& extract(std::pair<key_type, Second> const& v)
{ {

2
test/unordered/Jamfile.v2
View File

@ -9,6 +9,8 @@ project unordered-test/unordered
: requirements : requirements
<warnings>all <warnings>all
<toolset>intel:<warnings>on <toolset>intel:<warnings>on
# Would be nice to define -Wundef, but I'm getting warnings from
# Boost.Preprocessor on trunk.
<toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wno-long-long" <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wno-long-long"
<toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion" <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
#<toolset>gcc:<define>_GLIBCXX_DEBUG #<toolset>gcc:<define>_GLIBCXX_DEBUG