diff options
| author | skym <skym@chromium.org> | 2015-12-10 16:27:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 00:28:35 +0000 |
| commit | 6344d79c2f94876e979d4760816090442c694845 (patch) | |
| tree | f9335bfe1593410b37ee62409de70ae6c24317ee /sync/syncable/model_neutral_mutable_entry.h | |
| parent | 64e809d03a59d44e42960058371035866f8a1038 (diff) | |
| download | chromium_src-6344d79c2f94876e979d4760816090442c694845.zip chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.gz chromium_src-6344d79c2f94876e979d4760816090442c694845.tar.bz2 | |
[Sync] Replacing SYNC_EXPORT_PRIVATE with SYNC_EXPORT for all usage, and fixing lint violations on all touched files.
Leaving the definition of the SYNC_EXPORT_PRIVATE macro because for some strange reason the iOS waterfall bot's incremental build doesn't re-generate the attachment's proto files. This causes a compile failure because the old versions of these generated files use the SYNC_EXPORT_MACRO. It has been difficult to reproduce this problem anywhere else, so it's unclear if something like a white-space change to the .proto definition would resolve this breakage.
BUG=554242, 567301
Review URL: https://codereview.chromium.org/1503343002
Cr-Commit-Position: refs/heads/master@{#364546}
Diffstat (limited to 'sync/syncable/model_neutral_mutable_entry.h')
| -rw-r--r-- | sync/syncable/model_neutral_mutable_entry.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sync/syncable/model_neutral_mutable_entry.h b/sync/syncable/model_neutral_mutable_entry.h index 76f5c63..8f25f23 100644 --- a/sync/syncable/model_neutral_mutable_entry.h +++ b/sync/syncable/model_neutral_mutable_entry.h @@ -5,6 +5,8 @@ #ifndef SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ #define SYNC_SYNCABLE_MODEL_NEUTRAL_MUTABLE_ENTRY_H_ +#include <string> + #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/syncable/entry.h" @@ -27,7 +29,7 @@ enum CreateNewTypeRoot { CREATE_NEW_TYPE_ROOT }; // to be communicated to the model (and the model's thread). It is not possible // to change an entry's SPECIFICS or UNIQUE_POSITION fields with this kind of // entry. -class SYNC_EXPORT_PRIVATE ModelNeutralMutableEntry : public Entry { +class SYNC_EXPORT ModelNeutralMutableEntry : public Entry { public: ModelNeutralMutableEntry(BaseWriteTransaction* trans, CreateNewUpdateItem, |