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/proxyserver.cc b/webrtc/base/proxyserver.cc
index 548cfbf..a17983d 100644
--- a/webrtc/base/proxyserver.cc
+++ b/webrtc/base/proxyserver.cc
@@ -124,7 +124,7 @@
if (buffer->GetBuffered(&size) && size == 0) {
void* p = buffer->GetWriteBuffer(&size);
read = socket->Recv(p, size);
- buffer->ConsumeWriteBuffer(_max(read, 0));
+ buffer->ConsumeWriteBuffer(std::max(read, 0));
}
}
@@ -134,7 +134,7 @@
int written;
const void* p = buffer->GetReadData(&size);
written = socket->Send(p, size);
- buffer->ConsumeReadData(_max(written, 0));
+ buffer->ConsumeReadData(std::max(written, 0));
}
void ProxyBinding::Destroy() {
