Update talk folder to revision=49952949

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4413 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2013-07-26 19:17:59 +00:00
parent 367f640bea
commit 1e09a71126
57 changed files with 916 additions and 398 deletions

View File

@@ -174,7 +174,7 @@ class PseudoTcpTestBase : public testing::Test,
void UpdateLocalClock() { UpdateClock(&local_, MSG_LCLOCK); }
void UpdateRemoteClock() { UpdateClock(&remote_, MSG_RCLOCK); }
void UpdateClock(PseudoTcp* tcp, uint32 message) {
long interval; // NOLINT
long interval = 0; // NOLINT
tcp->GetNextClock(PseudoTcp::Now(), interval);
interval = talk_base::_max<int>(interval, 0L); // sometimes interval is < 0
talk_base::Thread::Current()->Clear(this, message);