Subject: [Boost-commit] svn:boost r76891 - in trunk: boost/unordered/detail libs/unordered/test/unordered
From: dnljms_at_[hidden]
Date: 2012-02-05 03:44:23
Author: danieljames
Date: 2012-02-05 03:44:22 EST (Sun, 05 Feb 2012)
New Revision: 76891
URL: http://svn.boost.org/trac/boost/changeset/76891
Log:
Unordered: Fix undefined macro warnings. Refs #6522.
Just removing the rv reference stuff in extract_keys. I don't it's
needed anyway.
Text files modified:
trunk/boost/unordered/detail/allocator_helpers.hpp | 4 ++++
trunk/boost/unordered/detail/extract_key.hpp | 15 ---------------
trunk/libs/unordered/test/unordered/Jamfile.v2 | 2 ++
3 files changed, 6 insertions(+), 15 deletions(-)
Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp (original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp 2012-02-05 03:44:22 EST (Sun, 05 Feb 2012)
@@ -26,6 +26,10 @@
#include <boost/assert.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
# include <memory>
#endif
Modified: trunk/boost/unordered/detail/extract_key.hpp
==============================================================================
--- trunk/boost/unordered/detail/extract_key.hpp (original)
+++ trunk/boost/unordered/detail/extract_key.hpp 2012-02-05 03:44:22 EST (Sun, 05 Feb 2012)
@@ -51,13 +51,6 @@
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()
{
return no_key();
@@ -69,7 +62,6 @@
{
return no_key();
}
-
#else
template <class Arg>
static no_key extract(Arg const&)
@@ -106,13 +98,6 @@
return v;
}
- // TODO: Why does this cause errors?
- //
- //static key_type const& extract(BOOST_RV_REF(key_type) v)
- //{
- // return v;
- //}
-
template <class Second>
static key_type const& extract(std::pair<key_type, Second> const& v)
{
Modified: trunk/libs/unordered/test/unordered/Jamfile.v2
==============================================================================
--- trunk/libs/unordered/test/unordered/Jamfile.v2 (original)
+++ trunk/libs/unordered/test/unordered/Jamfile.v2 2012-02-05 03:44:22 EST (Sun, 05 Feb 2012)
@@ -9,6 +9,8 @@
: requirements
<warnings>all
<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>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
#<toolset>gcc:<define>_GLIBCXX_DEBUG