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/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc
index 32b4694..1f124ee 100644
--- a/webrtc/p2p/base/stunrequest.cc
+++ b/webrtc/p2p/base/stunrequest.cc
@@ -10,6 +10,7 @@
#include "webrtc/p2p/base/stunrequest.h"
+#include <algorithm>
#include "webrtc/base/common.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
@@ -192,7 +193,7 @@
}
int StunRequest::GetNextDelay() {
- int delay = DELAY_UNIT * rtc::_min(1 << count_, DELAY_MAX_FACTOR);
+ int delay = DELAY_UNIT * std::min(1 << count_, DELAY_MAX_FACTOR);
count_ += 1;
if (count_ == MAX_SENDS)
timeout_ = true;