Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: sync/engine/directory_commit_contribution.cc

Issue 1545553003: Switch to standard integer types in sync/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/directory_commit_contribution.h ('k') | sync/engine/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/directory_commit_contribution.cc
diff --git a/sync/engine/directory_commit_contribution.cc b/sync/engine/directory_commit_contribution.cc
index a65e3da3997e529d5c0deb4250baa84a3ae5cf70..00af906fea60f489b029110ca543841293ab5cf9 100644
--- a/sync/engine/directory_commit_contribution.cc
+++ b/sync/engine/directory_commit_contribution.cc
@@ -4,6 +4,9 @@
#include "sync/engine/directory_commit_contribution.h"
+#include <stddef.h>
+#include <stdint.h>
+
#include <algorithm>
#include <set>
@@ -31,7 +34,7 @@ scoped_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
DirectoryTypeDebugInfoEmitter* debug_info_emitter) {
DCHECK(debug_info_emitter);
- std::vector<int64> metahandles;
+ std::vector<int64_t> metahandles;
syncable::ModelNeutralWriteTransaction trans(FROM_HERE, SYNCER, dir);
GetCommitIdsForType(&trans, type, max_entries, &metahandles);
@@ -40,7 +43,7 @@ scoped_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
return scoped_ptr<DirectoryCommitContribution>();
google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> entities;
- for (std::vector<int64>::iterator it = metahandles.begin();
+ for (std::vector<int64_t>::iterator it = metahandles.begin();
it != metahandles.end(); ++it) {
sync_pb::SyncEntity* entity = entities.Add();
syncable::ModelNeutralMutableEntry entry(&trans, GET_BY_HANDLE, *it);
@@ -169,7 +172,7 @@ size_t DirectoryCommitContribution::GetNumEntries() const {
}
DirectoryCommitContribution::DirectoryCommitContribution(
- const std::vector<int64>& metahandles,
+ const std::vector<int64_t>& metahandles,
const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity>& entities,
const sync_pb::DataTypeContext& context,
syncable::Directory* dir,
@@ -184,7 +187,7 @@ DirectoryCommitContribution::DirectoryCommitContribution(
void DirectoryCommitContribution::UnsetSyncingBits() {
syncable::ModelNeutralWriteTransaction trans(FROM_HERE, SYNCER, dir_);
- for (std::vector<int64>::const_iterator it = metahandles_.begin();
+ for (std::vector<int64_t>::const_iterator it = metahandles_.begin();
it != metahandles_.end(); ++it) {
syncable::ModelNeutralMutableEntry entry(&trans, GET_BY_HANDLE, *it);
// TODO(sync): this seems like it could be harmful if a sync cycle doesn't
« no previous file with comments | « sync/engine/directory_commit_contribution.h ('k') | sync/engine/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698