| Index: sync/internal_api/change_reorder_buffer.h
|
| diff --git a/sync/internal_api/change_reorder_buffer.h b/sync/internal_api/change_reorder_buffer.h
|
| index c1c577d43a751795b9cf8cd4b4ba5ac79e3ac400..a1917f31706fa50da38f998400e002c6f783d6ff 100644
|
| --- a/sync/internal_api/change_reorder_buffer.h
|
| +++ b/sync/internal_api/change_reorder_buffer.h
|
| @@ -9,10 +9,13 @@
|
| #ifndef SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
|
| #define SYNC_INTERNAL_API_CHANGE_REORDER_BUFFER_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "sync/internal_api/public/change_record.h"
|
| #include "sync/protocol/sync.pb.h"
|
| @@ -38,19 +41,19 @@ class ChangeReorderBuffer {
|
|
|
| // Insert an item, identified by the metahandle |id|, into the reorder buffer.
|
| // This item will appear in the output list as an ACTION_ADD ChangeRecord.
|
| - void PushAddedItem(int64 id);
|
| + void PushAddedItem(int64_t id);
|
|
|
| // Insert an item, identified by the metahandle |id|, into the reorder buffer.
|
| // This item will appear in the output list as an ACTION_DELETE ChangeRecord.
|
| - void PushDeletedItem(int64 id);
|
| + void PushDeletedItem(int64_t id);
|
|
|
| // Insert an item, identified by the metahandle |id|, into the reorder buffer.
|
| // This item will appear in the output list as an ACTION_UPDATE ChangeRecord.
|
| - void PushUpdatedItem(int64 id);
|
| + void PushUpdatedItem(int64_t id);
|
|
|
| - void SetExtraDataForId(int64 id, ExtraPasswordChangeRecordData* extra);
|
| + void SetExtraDataForId(int64_t id, ExtraPasswordChangeRecordData* extra);
|
|
|
| - void SetSpecificsForId(int64 id, const sync_pb::EntitySpecifics& specifics);
|
| + void SetSpecificsForId(int64_t id, const sync_pb::EntitySpecifics& specifics);
|
|
|
| // Reset the buffer, forgetting any pushed items, so that it can be used again
|
| // to reorder a new set of changes.
|
| @@ -68,9 +71,9 @@ class ChangeReorderBuffer {
|
|
|
| private:
|
| class Traversal;
|
| - typedef std::map<int64, ChangeRecord::Action> OperationMap;
|
| - typedef std::map<int64, sync_pb::EntitySpecifics> SpecificsMap;
|
| - typedef std::map<int64, linked_ptr<ExtraPasswordChangeRecordData> >
|
| + typedef std::map<int64_t, ChangeRecord::Action> OperationMap;
|
| + typedef std::map<int64_t, sync_pb::EntitySpecifics> SpecificsMap;
|
| + typedef std::map<int64_t, linked_ptr<ExtraPasswordChangeRecordData>>
|
| ExtraDataMap;
|
|
|
| // Stores the items that have been pushed into the buffer, and the type of
|
|
|