Rebase webrtc/base with r6521 version of talk/base:

cd webrtc/base
svn diff -r 6466:66521 http://webrtc.googlecode.com/svn/trunk/talk/base >
6521.diff
patch -p0 -i 6521.diff

BUG=3379
TBR=jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17769004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6522 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-06-23 16:15:27 +00:00
parent 948f768580
commit c00ca627fd
2 changed files with 12 additions and 0 deletions

View File

@ -61,4 +61,12 @@ void LogAssert(const char* function, const char* file, int line,
}
}
bool IsOdd(int n) {
return (n & 0x1);
}
bool IsEven(int n) {
return !IsOdd(n);
}
} // namespace rtc

View File

@ -98,6 +98,10 @@ typedef void (*AssertLogger)(const char* function,
// only by one component.
void SetCustomAssertLogger(AssertLogger logger);
bool IsOdd(int n);
bool IsEven(int n);
} // namespace rtc
#if ENABLE_DEBUG