| Index: sync/engine/apply_control_data_updates.cc
|
| diff --git a/sync/engine/apply_control_data_updates.cc b/sync/engine/apply_control_data_updates.cc
|
| index ce6c6c5e65e804e6f54396837f17f229334391b6..0f5ae398c6aa9f9d15e651973fb2aa3456feb6ab 100644
|
| --- a/sync/engine/apply_control_data_updates.cc
|
| +++ b/sync/engine/apply_control_data_updates.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "sync/engine/apply_control_data_updates.h"
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| #include "base/metrics/histogram.h"
|
| @@ -22,7 +24,7 @@ namespace syncer {
|
| void ApplyControlDataUpdates(syncable::Directory* dir) {
|
| syncable::WriteTransaction trans(FROM_HERE, syncable::SYNCER, dir);
|
|
|
| - std::vector<int64> handles;
|
| + std::vector<int64_t> handles;
|
| dir->GetUnappliedUpdateMetaHandles(
|
| &trans, ToFullModelTypeSet(ControlTypes()), &handles);
|
|
|
| @@ -67,7 +69,7 @@ void ApplyControlDataUpdates(syncable::Directory* dir) {
|
|
|
| // Go through the rest of the unapplied control updates, skipping over any
|
| // top level folders.
|
| - for (std::vector<int64>::const_iterator iter = handles.begin();
|
| + for (std::vector<int64_t>::const_iterator iter = handles.begin();
|
| iter != handles.end(); ++iter) {
|
| syncable::MutableEntry entry(&trans, syncable::GET_BY_HANDLE, *iter);
|
| CHECK(entry.good());
|
|
|