Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/functional/hash/hash_fwd.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/functional/hash/hash_fwd.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/functional/hash/hash_fwd.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -10,11 +10,11 @@ #if !defined(BOOST_FUNCTIONAL_HASH_FWD_HPP) #define BOOST_FUNCTIONAL_HASH_FWD_HPP -#if defined(_MSC_VER) && (_MSC_VER >= 1020) -# pragma once +#include <boost/config.hpp> +#if defined(BOOST_HAS_PRAGMA_ONCE) +#pragma once #endif -#include <boost/config.hpp> #include <cstddef> #include <boost/detail/workaround.hpp> @@ -22,11 +22,7 @@ { template <class T> struct hash; -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - template <class T> void hash_combine(std::size_t& seed, T& v); -#else template <class T> void hash_combine(std::size_t& seed, T const& v); -#endif template <class It> std::size_t hash_range(It, It); template <class It> void hash_range(std::size_t&, It, It);