summaryrefslogtreecommitdiffstats
path: root/sync/sessions/ordered_commit_set.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
commit65f173550226cb0dcf577183a462d48c47764ee3 (patch)
tree9d4451edfc037f39658b804f95a3fbdbc85a7bd5 /sync/sessions/ordered_commit_set.h
parent7953ef8eea2001287dbd233421226ad3f0e16448 (diff)
downloadchromium_src-65f173550226cb0dcf577183a462d48c47764ee3.zip
chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.gz
chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.bz2
[Sync] Rename csync namespace to syncer
Everyone was confused by 'csync'. 'syncer' seems more understandable. (Note that we can't use the 'sync' namespace since sync() is a function from unistd.h.) BUG=10662035 TEST= TBR=jhawkins@chromium.org,pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10698014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/ordered_commit_set.h')
-rw-r--r--sync/sessions/ordered_commit_set.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sync/sessions/ordered_commit_set.h b/sync/sessions/ordered_commit_set.h
index 7c1937e..1fe8d7c 100644
--- a/sync/sessions/ordered_commit_set.h
+++ b/sync/sessions/ordered_commit_set.h
@@ -14,7 +14,7 @@
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/syncable/syncable_id.h"
-namespace csync {
+namespace syncer {
namespace sessions {
// TODO(ncarter): This code is more generic than just Commit and can
@@ -30,7 +30,7 @@ class OrderedCommitSet {
typedef std::vector<size_t> Projection;
// TODO(chron): Reserve space according to batch size?
- explicit OrderedCommitSet(const csync::ModelSafeRoutingInfo& routes);
+ explicit OrderedCommitSet(const syncer::ModelSafeRoutingInfo& routes);
~OrderedCommitSet();
bool HaveCommitItem(const int64 metahandle) const {
@@ -65,7 +65,7 @@ class OrderedCommitSet {
// response one ModelSafeGroup at a time. See GetCommitIdAt for how the
// indices contained in the returned Projection can be used.
const Projection& GetCommitIdProjection(
- csync::ModelSafeGroup group) const;
+ syncer::ModelSafeGroup group) const;
size_t Size() const {
return commit_ids_.size();
@@ -89,7 +89,7 @@ class OrderedCommitSet {
void operator=(const OrderedCommitSet& other);
private:
// A set of CommitIdProjections associated with particular ModelSafeGroups.
- typedef std::map<csync::ModelSafeGroup, Projection> Projections;
+ typedef std::map<syncer::ModelSafeGroup, Projection> Projections;
// Helper container for return value of GetCommitItemAt.
struct CommitItem {
@@ -115,11 +115,11 @@ class OrderedCommitSet {
// and shouldn't take up too much extra space since commit lists are small.
std::vector<syncable::ModelType> types_;
- csync::ModelSafeRoutingInfo routes_;
+ syncer::ModelSafeRoutingInfo routes_;
};
} // namespace sessions
-} // namespace csync
+} // namespace syncer
#endif // SYNC_SESSIONS_ORDERED_COMMIT_SET_H_