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 authored and andrascii committed 2019-08-10 11:59:22 +03:00
1 parent 90a0e36638
commit fd310d2706
1 file changed
+4
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/container_hash/hash.hpp
+4
View File
@@ -119,7 +119,11 @@ namespace boost
{
namespace hash_detail
{
<<<<<<< HEAD
#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>
struct hash_base
{