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/bytebuffer.cc b/webrtc/base/bytebuffer.cc
index 6133759..d2aa4cf 100644
--- a/webrtc/base/bytebuffer.cc
+++ b/webrtc/base/bytebuffer.cc
@@ -189,13 +189,13 @@
}
void ByteBuffer::Resize(size_t size) {
- size_t len = _min(end_ - start_, size);
+ size_t len = std::min(end_ - start_, size);
if (size <= size_) {
// Don't reallocate, just move data backwards
memmove(bytes_, bytes_ + start_, len);
} else {
// Reallocate a larger buffer.
- size_ = _max(size, 3 * size_ / 2);
+ size_ = std::max(size, 3 * size_ / 2);
char* new_bytes = new char[size_];
memcpy(new_bytes, bytes_ + start_, len);
delete [] bytes_;