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/testutils.h b/webrtc/base/testutils.h
index 74fed45..4c978e7 100644
--- a/webrtc/base/testutils.h
+++ b/webrtc/base/testutils.h
@@ -22,6 +22,7 @@
#undef Bool
#endif
+#include <algorithm>
#include <map>
#include <vector>
#include "webrtc/base/asyncsocket.h"
@@ -223,7 +224,7 @@
if ((SS_OPENING == state_) || (readable_data_.size() <= read_block_)) {
return SR_BLOCK;
}
- size_t count = _min(buffer_len, readable_data_.size() - read_block_);
+ size_t count = std::min(buffer_len, readable_data_.size() - read_block_);
memcpy(buffer, &readable_data_[0], count);
size_t new_size = readable_data_.size() - count;
// Avoid undefined access beyond the last element of the vector.