From 4856ced07dfda549a142df3a5fa28cbb73bf1865 Mon Sep 17 00:00:00 2001 From: avi Date: Mon, 21 Dec 2015 19:14:10 -0800 Subject: 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} --- sync/syncable/mutable_entry.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sync/syncable/mutable_entry.h') diff --git a/sync/syncable/mutable_entry.h b/sync/syncable/mutable_entry.h index efffa12..8cc5df7 100644 --- a/sync/syncable/mutable_entry.h +++ b/sync/syncable/mutable_entry.h @@ -5,8 +5,11 @@ #ifndef SYNC_SYNCABLE_MUTABLE_ENTRY_H_ #define SYNC_SYNCABLE_MUTABLE_ENTRY_H_ +#include + #include +#include "base/macros.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/syncable/entry.h" @@ -41,7 +44,7 @@ class SYNC_EXPORT MutableEntry : public ModelNeutralMutableEntry { ModelType model_type, const Id& parent_id, const std::string& name); - MutableEntry(WriteTransaction* trans, GetByHandle, int64); + MutableEntry(WriteTransaction* trans, GetByHandle, int64_t); MutableEntry(WriteTransaction* trans, GetById, const Id&); MutableEntry(WriteTransaction* trans, GetByClientTag, const std::string& tag); MutableEntry(WriteTransaction* trans, GetTypeRoot, ModelType type); @@ -52,7 +55,7 @@ class SYNC_EXPORT MutableEntry : public ModelNeutralMutableEntry { // Model-changing setters. These setters make user-visible changes that will // need to be communicated either to the local model or the sync server. - void PutLocalExternalId(int64 value); + void PutLocalExternalId(int64_t value); void PutMtime(base::Time value); void PutCtime(base::Time value); void PutParentId(const Id& value); -- cgit v1.1