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

Unified Diff: sync/engine/commit_util.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/commit_util.h ('k') | sync/engine/conflict_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit_util.cc
diff --git a/sync/engine/commit_util.cc b/sync/engine/commit_util.cc
index 25152169a92e029b8ab0c38d363a78498395ec73..f2ac07671978097e750468834544b4c35ae813ac 100644
--- a/sync/engine/commit_util.cc
+++ b/sync/engine/commit_util.cc
@@ -4,6 +4,8 @@
#include "sync/engine/commit_util.h"
+#include <stdint.h>
+
#include <limits>
#include <set>
#include <string>
@@ -152,7 +154,7 @@ void BuildCommitItem(
sync_entry->set_old_parent_id(SyncableIdToProto(server_parent_id));
}
- int64 version = meta_entry.GetBaseVersion();
+ int64_t version = meta_entry.GetBaseVersion();
if (syncable::CHANGES_VERSION == version || 0 == version) {
// Undeletions are only supported for items that have a client tag.
DCHECK(!id.ServerKnows() ||
@@ -232,8 +234,8 @@ bool UpdateVersionAfterCommit(
const sync_pb::CommitResponse_EntryResponse& entry_response,
const syncable::Id& pre_commit_id,
syncable::ModelNeutralMutableEntry* local_entry) {
- int64 old_version = local_entry->GetBaseVersion();
- int64 new_version = entry_response.version();
+ int64_t old_version = local_entry->GetBaseVersion();
+ int64_t new_version = entry_response.version();
bool bad_commit_version = false;
if (committed_entry.deleted() &&
!local_entry->GetUniqueClientTag().empty()) {
@@ -391,12 +393,11 @@ void ProcessSuccessfulCommitResponse(
} // namespace
-sync_pb::CommitResponse::ResponseType
-ProcessSingleCommitResponse(
+sync_pb::CommitResponse::ResponseType ProcessSingleCommitResponse(
syncable::BaseWriteTransaction* trans,
const sync_pb::CommitResponse_EntryResponse& server_entry,
const sync_pb::SyncEntity& commit_request_entry,
- int64 metahandle,
+ int64_t metahandle,
set<syncable::Id>* deleted_folders) {
syncable::ModelNeutralMutableEntry local_entry(
trans,
« no previous file with comments | « sync/engine/commit_util.h ('k') | sync/engine/conflict_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698