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

Unified Diff: sync/syncable/syncable_id.h

Issue 11624037: [sync] Componentize sync: Part 6: Add more SYNC_EXPORTs to files in src/sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase (no code changes) Created 7 years, 12 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
« no previous file with comments | « sync/syncable/syncable_enum_conversions.h ('k') | sync/syncable/syncable_proto_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/syncable_id.h
diff --git a/sync/syncable/syncable_id.h b/sync/syncable/syncable_id.h
index 64fc7f695fe3ec3ec884e25fa6c54e8a1b2523f9..9fe4bdc6b2848e61955592556e41a8c67c3b4f28 100644
--- a/sync/syncable/syncable_id.h
+++ b/sync/syncable/syncable_id.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/hash_tables.h"
+#include "sync/base/sync_export.h"
class MockConnectionManager;
@@ -28,7 +29,7 @@ namespace syncable {
struct EntryKernel;
class Id;
-std::ostream& operator<<(std::ostream& out, const Id& id);
+SYNC_EXPORT_PRIVATE 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.
@@ -40,7 +41,7 @@ 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 Id {
+class SYNC_EXPORT Id {
public:
// This constructor will be handy even when we move away from int64s, just
// for unit tests.
@@ -115,14 +116,15 @@ class Id {
friend scoped_ptr<EntryKernel> UnpackEntry(sql::Statement* statement);
friend void BindFields(const EntryKernel& entry,
sql::Statement* statement);
- friend std::ostream& operator<<(std::ostream& out, const Id& id);
+ SYNC_EXPORT_PRIVATE friend std::ostream& operator<<(std::ostream& out,
+ const Id& id);
friend class MockConnectionManager;
friend class SyncableIdTest;
std::string s_;
};
-Id GetNullId();
+SYNC_EXPORT_PRIVATE Id GetNullId();
} // namespace syncable
} // namespace syncer
« no previous file with comments | « sync/syncable/syncable_enum_conversions.h ('k') | sync/syncable/syncable_proto_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698