diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 23:16:08 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 23:16:08 +0000 |
| commit | c9ce60ba84839bb415222019f97c2499c64eb3f4 (patch) | |
| tree | 2951b4af13346acfb545a6ccc3a621c1560a863a /sync/internal_api/change_reorder_buffer.cc | |
| parent | 05aee8931fc1b9a1cf73003cba7f05673bb4959d (diff) | |
| download | chromium_src-c9ce60ba84839bb415222019f97c2499c64eb3f4.zip chromium_src-c9ce60ba84839bb415222019f97c2499c64eb3f4.tar.gz chromium_src-c9ce60ba84839bb415222019f97c2499c64eb3f4.tar.bz2 | |
[sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp
In order to move src/sync into its own compoent, all the static_library targets in sync.gyp need to be converted to targets of type 'none' and rolled into one sync target of type component. This is currently blocked by duplicate .cc filenames in syncable and internal_api, which flags an error while running gyp. The offending files are {internal_api|syncable}/{base|read|write}_transaction.cc.
This patch renames syncable/{base|read|write}_transaction.{h|cc} to syncable/syncable_{base|read|write}_transaction.{h|cc}.
BUG=136928
Review URL: https://codereview.chromium.org/11638018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/change_reorder_buffer.cc')
| -rw-r--r-- | sync/internal_api/change_reorder_buffer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/internal_api/change_reorder_buffer.cc b/sync/internal_api/change_reorder_buffer.cc index 5188309..e6e4e2f 100644 --- a/sync/internal_api/change_reorder_buffer.cc +++ b/sync/internal_api/change_reorder_buffer.cc @@ -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. @@ -11,9 +11,9 @@ #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/read_node.h" -#include "sync/syncable/base_transaction.h" #include "sync/syncable/directory.h" #include "sync/syncable/entry.h" +#include "sync/syncable/syncable_base_transaction.h" using std::numeric_limits; using std::pair; |