| Index: base/pending_task.cc
|
| diff --git a/base/pending_task.cc b/base/pending_task.cc
|
| index 3d7891414c8dc7df431f0c4d8a6bf8dcb26eb9a5..b288f28d09f8a62044c419b3e18676e6558c3771 100644
|
| --- a/base/pending_task.cc
|
| +++ b/base/pending_task.cc
|
| @@ -8,14 +8,19 @@
|
|
|
| namespace base {
|
|
|
| +#if _MSC_VER >= 1700
|
| +// This a temporary fix for compiling on VS2012. http://crbug.com/154744
|
| +PendingTask::PendingTask() : sequence_num(-1), nestable(false) {
|
| +}
|
| +#endif
|
| +
|
| PendingTask::PendingTask(const tracked_objects::Location& posted_from,
|
| const base::Closure& task)
|
| : base::TrackingInfo(posted_from, TimeTicks()),
|
| task(task),
|
| posted_from(posted_from),
|
| sequence_num(0),
|
| - nestable(true),
|
| - is_high_res(false) {
|
| + nestable(true) {
|
| }
|
|
|
| PendingTask::PendingTask(const tracked_objects::Location& posted_from,
|
| @@ -26,8 +31,7 @@
|
| task(task),
|
| posted_from(posted_from),
|
| sequence_num(0),
|
| - nestable(nestable),
|
| - is_high_res(false) {
|
| + nestable(nestable) {
|
| }
|
|
|
| PendingTask::~PendingTask() {
|
|
|