zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::min and std::max instead of self-defined functions such as rtc::_min/_max.

Browse Source 
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
This commit is contained in:
andresp@webrtc.org
2015-02-12 11:54:26 +00:00
parent 9e4e524f38
commit ff689be3c0
46 changed files with 164 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/base/diskcache.cc
View File

@ -14,6 +14,7 @@
#include "webrtc/base/win32.h"
#endif
#include <algorithm>
#include "webrtc/base/common.h"
#include "webrtc/base/diskcache.h"
#include "webrtc/base/fileutils.h"
@ -127,7 +128,7 @@ StreamInterface* DiskCache::WriteResource(const std::string& id, size_t index) {
return NULL;
}
entry->streams = stdmax(entry->streams, index + 1);
entry->streams = std::max(entry->streams, index + 1);
entry->size -= previous_size;
total_size_ -= previous_size;