| commit | a9890800e078105f21f0a21358ee59a0b3736af6 | [log] [tgz] |
|---|---|---|
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Dec 13 00:21:03 2013 +0000 |
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Dec 13 00:21:03 2013 +0000 |
| tree | 1b3c41ea5f2eabc3f3005b18d2968ace322a8fa8 | |
| parent | a92baead393eae35626319aaf1a49bcf527630b5 [diff] [blame] |
Update talk to 58127566 together with https://webrtc-codereview.appspot.com/5309005/. R=mallinath@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5719004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5277 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/timeutils.cc b/talk/base/timeutils.cc index 66b9bf2..54db341 100644 --- a/talk/base/timeutils.cc +++ b/talk/base/timeutils.cc
@@ -94,6 +94,10 @@ return static_cast<uint32>(TimeNanos() / kNumNanosecsPerMillisec); } +uint64 TimeMicros() { + return static_cast<uint64>(TimeNanos() / kNumNanosecsPerMicrosec); +} + #if defined(WIN32) static const uint64 kFileTimeToUnixTimeEpochOffset = 116444736000000000ULL;