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/logging.cc b/webrtc/base/logging.cc
index a417ed6..2cf567c 100644
--- a/webrtc/base/logging.cc
+++ b/webrtc/base/logging.cc
@@ -27,10 +27,11 @@
#endif // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID
#include <time.h>
-
-#include <ostream>
-#include <iomanip>
#include <limits.h>
+
+#include <algorithm>
+#include <iomanip>
+#include <ostream>
#include <vector>
#include "webrtc/base/logging.h"
@@ -247,7 +248,7 @@
int sev = NO_LOGGING;
for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
if (!stream || stream == it->first) {
- sev = _min(sev, it->second);
+ sev = std::min(sev, it->second);
}
}
return sev;
@@ -368,7 +369,7 @@
void LogMessage::UpdateMinLogSeverity() {
int min_sev = dbg_sev_;
for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
- min_sev = _min(dbg_sev_, it->second);
+ min_sev = std::min(dbg_sev_, it->second);
}
min_sev_ = min_sev;
}
@@ -524,7 +525,7 @@
while (len > 0) {
memset(asc_line, ' ', sizeof(asc_line));
memset(hex_line, ' ', sizeof(hex_line));
- size_t line_len = _min(len, LINE_SIZE);
+ size_t line_len = std::min(len, LINE_SIZE);
for (size_t i = 0; i < line_len; ++i) {
unsigned char ch = udata[i];
asc_line[i] = isprint(ch) ? ch : '.';