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
This commit is contained in:
@ -52,12 +52,7 @@ inline void RtcUnused(const void*) {}
|
||||
#define stricmp(x, y) strcasecmp(x, y)
|
||||
#endif
|
||||
|
||||
// TODO(fbarchard): Remove this. std::max should be used everywhere in the code.
|
||||
// NOMINMAX must be defined where we include <windows.h>.
|
||||
#define stdmax(x, y) std::max(x, y)
|
||||
#else
|
||||
#define stdmax(x, y) rtc::_max(x, y)
|
||||
#endif
|
||||
#endif // !defined(WEBRTC_WIN)
|
||||
|
||||
#define ARRAY_SIZE(x) (static_cast<int>(sizeof(x) / sizeof(x[0])))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user