Index: webrtc/base/taskrunner.h |
diff --git a/webrtc/base/taskrunner.h b/webrtc/base/taskrunner.h |
index bdcebc4bdc4799debe92781ae5b9f0a0562c91a2..9a43aac068106e24392e37ea84ee5e79751b4629 100644 |
--- a/webrtc/base/taskrunner.h |
+++ b/webrtc/base/taskrunner.h |
@@ -20,9 +20,9 @@ |
namespace rtc { |
class Task; |
-const int64 kSecToMsec = 1000; |
-const int64 kMsecTo100ns = 10000; |
-const int64 kSecTo100ns = kSecToMsec * kMsecTo100ns; |
+const int64_t kSecToMsec = 1000; |
+const int64_t kMsecTo100ns = 10000; |
+const int64_t kSecTo100ns = kSecToMsec * kMsecTo100ns; |
class TaskRunner : public TaskParent, public sigslot::has_slots<> { |
public: |
@@ -36,13 +36,13 @@ class TaskRunner : public TaskParent, public sigslot::has_slots<> { |
// the units and that rollover while the computer is running. |
// |
// On Windows, GetSystemTimeAsFileTime is the typical implementation. |
- virtual int64 CurrentTime() = 0 ; |
+ virtual int64_t CurrentTime() = 0; |
void StartTask(Task *task); |
void RunTasks(); |
void PollTasks(); |
- void UpdateTaskTimeout(Task *task, int64 previous_task_timeout_time); |
+ void UpdateTaskTimeout(Task* task, int64_t previous_task_timeout_time); |
#ifdef _DEBUG |
bool is_ok_to_delete(Task* task) { |
@@ -60,7 +60,7 @@ class TaskRunner : public TaskParent, public sigslot::has_slots<> { |
// Returns the next absolute time when a task times out |
// OR "0" if there is no next timeout. |
- int64 next_task_timeout() const; |
+ int64_t next_task_timeout() const; |
protected: |
// The primary usage of this method is to know if |
@@ -82,7 +82,7 @@ class TaskRunner : public TaskParent, public sigslot::has_slots<> { |
private: |
void InternalRunTasks(bool in_destructor); |
- void CheckForTimeoutChange(int64 previous_timeout_time); |
+ void CheckForTimeoutChange(int64_t previous_timeout_time); |
std::vector<Task *> tasks_; |
Task *next_timeout_task_; |