Use std::min and std::max instead of self-defined functions such as rtc::_min/_max.
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35079004
Cr-Commit-Position: refs/heads/master@{#8347}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8347 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/base/messagequeue.cc b/webrtc/base/messagequeue.cc
index 1b312ff..74b1024 100644
--- a/webrtc/base/messagequeue.cc
+++ b/webrtc/base/messagequeue.cc
@@ -12,6 +12,8 @@
#include <sys/time.h>
#endif
+#include <algorithm>
+
#include "webrtc/base/common.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/messagequeue.h"
@@ -244,7 +246,7 @@
if (cmsWait == kForever) {
cmsNext = cmsDelayNext;
} else {
- cmsNext = _max(0, cmsTotal - cmsElapsed);
+ cmsNext = std::max(0, cmsTotal - cmsElapsed);
if ((cmsDelayNext != kForever) && (cmsDelayNext < cmsNext))
cmsNext = cmsDelayNext;
}