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

Unified Diff: components/sync/syncable/syncable_id.h

Issue 2240613002: [Sync] Convert sync to a static library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try getting rid of sync_core source set. Created 4 years, 4 months 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
Index: components/sync/syncable/syncable_id.h
diff --git a/components/sync/syncable/syncable_id.h b/components/sync/syncable/syncable_id.h
index 569757bc7f8672c2e0a2ad257b8ae5607af8a37c..f96fb83f185a7ed13df6dfa0691caabc518e372d 100644
--- a/components/sync/syncable/syncable_id.h
+++ b/components/sync/syncable/syncable_id.h
@@ -12,7 +12,6 @@
#include <string>
#include "base/containers/hash_tables.h"
-#include "components/sync/base/sync_export.h"
namespace base {
class StringValue;
@@ -27,7 +26,7 @@ namespace syncable {
struct EntryKernel;
class Id;
-SYNC_EXPORT std::ostream& operator<<(std::ostream& out, const Id& id);
+std::ostream& operator<<(std::ostream& out, const Id& id);
// For historical reasons, 3 concepts got everloaded into the Id:
// 1. A unique, opaque identifier for the object.
@@ -39,7 +38,7 @@ SYNC_EXPORT std::ostream& operator<<(std::ostream& out, const Id& id);
// 1. c<client only opaque id> for client items that have not been committed.
// 2. r for the root item.
// 3. s<server provided opaque id> for items that the server knows about.
-class SYNC_EXPORT Id {
+class Id {
public:
inline Id() {}
inline Id(const Id& that) { Copy(that); }
@@ -91,7 +90,7 @@ class SYNC_EXPORT Id {
friend std::unique_ptr<EntryKernel> UnpackEntry(sql::Statement* statement,
int* total_created_entries);
friend void BindFields(const EntryKernel& entry, sql::Statement* statement);
- SYNC_EXPORT friend std::ostream& operator<<(std::ostream& out, const Id& id);
+ friend std::ostream& operator<<(std::ostream& out, const Id& id);
friend class SyncableIdTest;
std::string s_;

Powered by Google App Engine
This is Rietveld 408576698