diff options
| author | avi <avi@chromium.org> | 2015-12-21 19:14:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-22 03:15:12 +0000 |
| commit | 4856ced07dfda549a142df3a5fa28cbb73bf1865 (patch) | |
| tree | a81aceedc8ee5507d9f22fb4f163d847bfae6d28 /sync/engine/model_type_worker.cc | |
| parent | 5af9dfc5f6ed2163b13d8c20d679bdb44c783769 (diff) | |
| download | chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.zip chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.gz chromium_src-4856ced07dfda549a142df3a5fa28cbb73bf1865.tar.bz2 | |
Switch to standard integer types in sync/.
BUG=138542
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/1545553003
Cr-Commit-Position: refs/heads/master@{#366533}
Diffstat (limited to 'sync/engine/model_type_worker.cc')
| -rw-r--r-- | sync/engine/model_type_worker.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sync/engine/model_type_worker.cc b/sync/engine/model_type_worker.cc index 991ee82..fa60f91 100644 --- a/sync/engine/model_type_worker.cc +++ b/sync/engine/model_type_worker.cc @@ -4,6 +4,9 @@ #include "sync/engine/model_type_worker.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include <vector> @@ -242,7 +245,7 @@ scoped_ptr<CommitContribution> ModelTypeWorker::GetContribution( DCHECK(CalledOnValidThread()); size_t space_remaining = max_entries; - std::vector<int64> sequence_numbers; + std::vector<int64_t> sequence_numbers; google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> commit_entities; if (!CanCommitItems()) @@ -254,7 +257,7 @@ scoped_ptr<CommitContribution> ModelTypeWorker::GetContribution( EntityTracker* entity = it->second.get(); if (entity->HasPendingCommit()) { sync_pb::SyncEntity* commit_entity = commit_entities.Add(); - int64 sequence_number = -1; + int64_t sequence_number = -1; entity->PrepareCommitProto(commit_entity, &sequence_number); HelpInitializeCommitEntity(commit_entity); |