Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Remove binary_function usage.

Browse Source 
std::binary_function was a pre-C++11 construct, that is removed entirely
in c++17, and no longer necessary regardless.

Refs #5862

Differential Revision: https://code.wildfiregames.com/D3164
This was SVN commit r24301.
This commit is contained in:
wraitii 2020-11-30 15:45:05 +00:00
parent ad2f08a355
commit 46399371ed
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/TextureManager.cpp
View File

@ -60,8 +60,6 @@ private:
};
struct TPequal_to
: std::binary_function<CTextureProperties, CTextureProperties, bool>,
std::binary_function<CTexturePtr, CTexturePtr, bool>
{
bool operator()(CTextureProperties const& a, CTextureProperties const& b) const
{

14
source/ps/Loader.cpp
View File

@ -82,17 +82,6 @@ struct LoadRequest
typedef std::deque<LoadRequest> LoadRequests;
static LoadRequests load_requests;
// std::accumulate binary op; used by LDR_EndRegistering to sum up all
// estimated durations (for % progress calculation)
struct DurationAdder: public std::binary_function<double, const LoadRequest&, double>
{
double operator()(double partial_result, const LoadRequest& lr) const
{
return partial_result + lr.estimated_duration_ms*1e-3;
}
};
// call before starting to register load requests.
// this routine is provided so we can prevent 2 simultaneous load operations,
// which is bogus. that can happen by clicking the load button quickly,
@ -134,7 +123,8 @@ void LDR_EndRegistering()
state = FIRST_LOAD;
estimated_duration_tally = 0.0;
task_elapsed_time = 0.0;
total_estimated_duration = std::accumulate(load_requests.begin(), load_requests.end(), 0.0, DurationAdder());
total_estimated_duration = std::accumulate(load_requests.begin(), load_requests.end(), 0.0,
[](double partial_result, const LoadRequest& lr) -> double { return partial_result + lr.estimated_duration_ms * 1e-3; });
}