diff --git a/src/Internat.cpp b/src/Internat.cpp index 6abcb98d9..5f7fd3f3e 100644 --- a/src/Internat.cpp +++ b/src/Internat.cpp @@ -305,6 +305,6 @@ wxArrayString LocalizedStrings( { wxArrayString results; std::transform( strings, strings + nStrings, std::back_inserter(results), - std::mem_fun_ref( &IdentInterfaceSymbol::Translation ) ); + std::mem_fn( &IdentInterfaceSymbol::Translation ) ); return results; } diff --git a/src/MemoryX.h b/src/MemoryX.h index a68eecf83..d662b6ea3 100644 --- a/src/MemoryX.h +++ b/src/MemoryX.h @@ -600,7 +600,7 @@ struct IteratorRange : public std::pair { R2 (C :: * pmf) () const ) const { - return this->accumulate( init, binary_op, std::mem_fun( pmf ) ); + return this->accumulate( init, binary_op, std::mem_fn( pmf ) ); } // Some accumulations frequent enough to be worth abbreviation: @@ -623,7 +623,7 @@ struct IteratorRange : public std::pair { > R min( R2 (C :: * pmf) () const ) const { - return this->min( std::mem_fun( pmf ) ); + return this->min( std::mem_fn( pmf ) ); } template< @@ -646,7 +646,7 @@ struct IteratorRange : public std::pair { > R max( R2 (C :: * pmf) () const ) const { - return this->max( std::mem_fun( pmf ) ); + return this->max( std::mem_fn( pmf ) ); } template< @@ -668,7 +668,7 @@ struct IteratorRange : public std::pair { > R sum( R2 (C :: * pmf) () const ) const { - return this->sum( std::mem_fun( pmf ) ); + return this->sum( std::mem_fn( pmf ) ); } }; diff --git a/src/ondemand/ODDecodeFFmpegTask.cpp b/src/ondemand/ODDecodeFFmpegTask.cpp index e291e5dce..45c687cdd 100644 --- a/src/ondemand/ODDecodeFFmpegTask.cpp +++ b/src/ondemand/ODDecodeFFmpegTask.cpp @@ -119,7 +119,7 @@ auto ODDecodeFFmpegTask::FromList(const std::list &channels) -> St Channels channels; channels.reserve(holders.size()); transform(holders.begin(), holders.end(), back_inserter(channels), - mem_fun_ref(&TrackHolders::value_type::get) + mem_fn(&TrackHolders::value_type::get) ); return channels; }