diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-01-19 14:40:06 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-21 10:20:22 +0000 |
commit | c4d3f5596662d6aced46f270f566b510a36e4952 (patch) | |
tree | 6e9b232c105ea36405e3d80d0c1db60d4091a7c1 /meta/recipes-support/boost/files | |
parent | 8e5ffa370c4259f925a0454fe7fd81c80ef2174b (diff) | |
download | openembedded-core-contrib-c4d3f5596662d6aced46f270f566b510a36e4952.tar.gz |
boost: Upgrade 1.51 -> 1.52
Drop hash_enums.patch which is already applied upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/files')
-rw-r--r-- | meta/recipes-support/boost/files/hash_enums.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-support/boost/files/hash_enums.patch b/meta/recipes-support/boost/files/hash_enums.patch deleted file mode 100644 index 368da962c1..0000000000 --- a/meta/recipes-support/boost/files/hash_enums.patch +++ /dev/null @@ -1,45 +0,0 @@ -Allow hashing of enums. -Fixes errors like - -/opt/poky/1.3.0-1/sysroots/i586-poky-linux/usr/include/boost/functional/hash/extensions.hpp:257:34: error: no matching function for call to 'hash_value(const myspace::idx&)' - -Upstream-Status: Pending -Singed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: boost_1_51_0/boost/functional/hash/hash.hpp -=================================================================== ---- boost_1_51_0.orig/boost/functional/hash/hash.hpp 2012-07-15 16:28:30.000000000 -0700 -+++ boost_1_51_0/boost/functional/hash/hash.hpp 2012-09-26 14:00:57.738364002 -0700 -@@ -15,6 +15,8 @@ - #include <boost/functional/hash/detail/hash_float.hpp> - #include <string> - #include <boost/limits.hpp> -+#include <boost/type_traits/is_enum.hpp> -+#include <boost/utility/enable_if.hpp> - - #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - #include <boost/type_traits/is_pointer.hpp> -@@ -89,6 +91,9 @@ - typename boost::hash_detail::long_numbers<T>::type hash_value(T); - template <typename T> - typename boost::hash_detail::ulong_numbers<T>::type hash_value(T); -+ template <typename T> -+ typename boost::enable_if<boost::is_enum<T>, std::size_t>::type -+ hash_value(T); - - #if !BOOST_WORKAROUND(__DMC__, <= 0x848) - template <class T> std::size_t hash_value(T* const&); -@@ -178,7 +183,12 @@ - { - return hash_detail::hash_value_unsigned(v); - } -- -+ template <typename T> -+ typename boost::enable_if<boost::is_enum<T>, std::size_t>::type -+ hash_value(T v) -+ { -+ return static_cast<std::size_t>(v); -+ } - // Implementation by Alberto Barbati and Dave Harris. - #if !BOOST_WORKAROUND(__DMC__, <= 0x848) - template <class T> std::size_t hash_value(T* const& v) |