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

Unified Diff: sync/internal_api/public/model_type_entity.h

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
Index: sync/internal_api/public/model_type_entity.h
diff --git a/sync/internal_api/public/model_type_entity.h b/sync/internal_api/public/model_type_entity.h
index 551f1bd7731b80b738a0c6611aad216f83a57be2..cabbaebb8492e0872d8ab8865c90a674b93f13e9 100644
--- a/sync/internal_api/public/model_type_entity.h
+++ b/sync/internal_api/public/model_type_entity.h
@@ -5,6 +5,8 @@
#ifndef SYNC_INTERNAL_API_PUBLIC_MODEL_TYPE_ENTITY_H_
#define SYNC_INTERNAL_API_PUBLIC_MODEL_TYPE_ENTITY_H_
+#include <stdint.h>
+
#include <string>
#include "base/memory/scoped_ptr.h"
@@ -53,10 +55,10 @@ class SYNC_EXPORT ModelTypeEntity {
bool RequiresCommitRequest() const;
// Returns true if the specified update version does not contain new data.
- bool UpdateIsReflection(int64 update_version) const;
+ bool UpdateIsReflection(int64_t update_version) const;
// Returns true if the specified update version conflicts with local changes.
- bool UpdateIsInConflict(int64 update_version) const;
+ bool UpdateIsInConflict(int64_t update_version) const;
// Applies an update from the sync server.
//
@@ -92,8 +94,8 @@ class SYNC_EXPORT ModelTypeEntity {
// possible that the committed item was already out of date by the time it
// reached the server.
void ReceiveCommitResponse(const std::string& id,
- int64 sequence_number,
- int64 response_version,
+ int64_t sequence_number,
+ int64_t response_version,
const std::string& encryption_key_name);
// Clears any in-memory sync state associated with outstanding commits.
@@ -133,7 +135,7 @@ class SYNC_EXPORT ModelTypeEntity {
EntityDataPtr commit_data_;
// The sequence number of the last item sent to the sync thread.
- int64 commit_requested_sequence_number_;
+ int64_t commit_requested_sequence_number_;
// TODO(stanisc): this should be removed.
// The name of the encryption key used to encrypt this item on the server.
« no previous file with comments | « sync/internal_api/public/internal_components_factory_impl.h ('k') | sync/internal_api/public/non_blocking_sync_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698