feedc0de/boost_container_hash
1
0
Fork 0
forked from boostorg/container_hash
Code Pull Requests Activity

Removed usage of std::unary_function for C++17 compliance

Browse Source
This commit is contained in:
Andrey
2019-08-09 17:23:16 +03:00
committed by andrascii
parent 90a0e36638
commit fd310d2706
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/container_hash/hash.hpp
View File

@@ -119,7 +119,11 @@ namespace boost
{ {
namespace hash_detail namespace hash_detail
{ {
<<<<<<< HEAD
#if defined(_HAS_AUTO_PTR_ETC) && !_HAS_AUTO_PTR_ETC || defined(BOOST_NO_CXX98_FUNCTION_BASE) #if defined(_HAS_AUTO_PTR_ETC) && !_HAS_AUTO_PTR_ETC || defined(BOOST_NO_CXX98_FUNCTION_BASE)
=======
#if defined(BOOST_NO_CXX98_FUNCTION_BASE)
>>>>>>> Removed usage of std::unary_function for C++17 compliance
template <typename T> template <typename T>
struct hash_base struct hash_base
{ {