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

Unified Diff: sync/internal_api/public/non_blocking_sync_common.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
« no previous file with comments | « sync/internal_api/public/model_type_entity.h ('k') | sync/internal_api/public/read_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/non_blocking_sync_common.h
diff --git a/sync/internal_api/public/non_blocking_sync_common.h b/sync/internal_api/public/non_blocking_sync_common.h
index 5fdcac32bea813bdbda7ff3560ac1255358590e3..799dfca538f8f37751aa3e95ae080cd036d66833 100644
--- a/sync/internal_api/public/non_blocking_sync_common.h
+++ b/sync/internal_api/public/non_blocking_sync_common.h
@@ -5,6 +5,8 @@
#ifndef SYNC_INTERNAL_API_PUBLIC_NON_BLOCKING_SYNC_COMMON_H_
#define SYNC_INTERNAL_API_PUBLIC_NON_BLOCKING_SYNC_COMMON_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
@@ -15,7 +17,7 @@
namespace syncer_v2 {
-static const int64 kUncommittedVersion = -1;
+static const int64_t kUncommittedVersion = -1;
// Data-type global state that must be accessed and updated on the sync thread,
// but persisted on or through the model thread.
@@ -52,8 +54,8 @@ struct SYNC_EXPORT CommitRequestData {
// Strictly incrementing number for in-progress commits. More information
// about its meaning can be found in comments in the files that make use of
// this struct.
- int64 sequence_number = 0;
- int64 base_version = 0;
+ int64_t sequence_number = 0;
+ int64_t base_version = 0;
};
struct SYNC_EXPORT CommitResponseData {
@@ -62,8 +64,8 @@ struct SYNC_EXPORT CommitResponseData {
std::string id;
std::string client_tag_hash;
- int64 sequence_number = 0;
- int64 response_version = 0;
+ int64_t sequence_number = 0;
+ int64_t response_version = 0;
};
struct SYNC_EXPORT UpdateResponseData {
@@ -72,7 +74,7 @@ struct SYNC_EXPORT UpdateResponseData {
EntityDataPtr entity;
- int64 response_version = 0;
+ int64_t response_version = 0;
std::string encryption_key_name;
};
« no previous file with comments | « sync/internal_api/public/model_type_entity.h ('k') | sync/internal_api/public/read_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698