| Index: sync/engine/directory_commit_contribution.h
|
| diff --git a/sync/engine/directory_commit_contribution.h b/sync/engine/directory_commit_contribution.h
|
| index dabb7d96b06c755f4114fac85f27f9347b14207a..b0ed9c8e11a4b34e6b3d9b00b4daf547b3830213 100644
|
| --- a/sync/engine/directory_commit_contribution.h
|
| +++ b/sync/engine/directory_commit_contribution.h
|
| @@ -5,9 +5,13 @@
|
| #ifndef SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
| #define SYNC_ENGINE_DIRECTORY_COMMIT_CONTRIBUTION_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "sync/base/sync_export.h"
|
| #include "sync/engine/commit_contribution.h"
|
| @@ -81,7 +85,7 @@ class SYNC_EXPORT DirectoryCommitContribution : public CommitContribution {
|
| GatherAndTruncate);
|
|
|
| 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* directory,
|
| @@ -90,7 +94,7 @@ class SYNC_EXPORT DirectoryCommitContribution : public CommitContribution {
|
| void UnsetSyncingBits();
|
|
|
| syncable::Directory* dir_;
|
| - const std::vector<int64> metahandles_;
|
| + const std::vector<int64_t> metahandles_;
|
| const google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> entities_;
|
| sync_pb::DataTypeContext context_;
|
| size_t entries_start_index_;
|
|
|