replace all std::min/std::max with just min/max

This errors out in MSVC since the inclusion of winsock2.h, CL uses the
macro not the template version.
This commit is contained in:
Ahmed Samy
2013-11-13 23:48:10 +02:00
parent f02d5e7975
commit 28d967ccce
19 changed files with 58 additions and 58 deletions

View File

@@ -89,7 +89,7 @@ bool AdaptativeFrameCounter::update()
void AdaptativeFrameCounter::setMaxFps(int maxFps)
{
maxFps = std::max(std::min(maxFps, 1000), 0);
maxFps = max(min(maxFps, 1000), 0);
if(maxFps != 0) {
m_bestFrameDelay = 1000000 / maxFps;