Skip to content

Commit

Permalink
Remove SYNC_IMPLEMENTATION from sync_tools_helper.
Browse files Browse the repository at this point in the history
With SYNC_IMPLEMENTATION gone from sync_tools_helper, we no longer need
to explicitly define a copy constructor and assignment operator for
Invalidation so remove them tool.  See bug for details.

BUG=394549

Review URL: https://codereview.chromium.org/412573002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284823 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
maniscalco@chromium.org committed Jul 23, 2014
1 parent 1e65919 commit 0ac9d1b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 29 deletions.
19 changes: 0 additions & 19 deletions sync/internal_api/public/base/invalidation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,6 @@ Invalidation Invalidation::InitFromDroppedInvalidation(
std::string(), dropped.ack_handle_);
}

Invalidation::Invalidation(const Invalidation& other)
: id_(other.id_),
is_unknown_version_(other.is_unknown_version_),
version_(other.version_),
payload_(other.payload_),
ack_handle_(other.ack_handle_),
ack_handler_(other.ack_handler_) {
}

scoped_ptr<Invalidation> Invalidation::InitFromValue(
const base::DictionaryValue& value) {
invalidation::ObjectId id;
Expand Down Expand Up @@ -96,16 +87,6 @@ scoped_ptr<Invalidation> Invalidation::InitFromValue(

Invalidation::~Invalidation() {}

Invalidation& Invalidation::operator=(const Invalidation& other) {
id_ = other.id_;
is_unknown_version_ = other.is_unknown_version_;
version_ = other.version_;
payload_ = other.payload_;
ack_handle_ = other.ack_handle_;
ack_handler_ = other.ack_handler_;
return *this;
}

invalidation::ObjectId Invalidation::object_id() const {
return id_;
}
Expand Down
7 changes: 0 additions & 7 deletions sync/internal_api/public/base/invalidation.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ class SYNC_EXPORT Invalidation {

~Invalidation();

// We define the copy and assignment operators explicitly for now, even
// though the implicit definitions would be good enough for our purposes.
// This is to work around some linker issues in the Windows build. See
// http://crbug.com/394549.
Invalidation(const Invalidation& other);
Invalidation& operator=(const Invalidation& other);

// Compares two invalidations. The comparison ignores ack-tracking state.
bool Equals(const Invalidation& other) const;

Expand Down
3 changes: 0 additions & 3 deletions sync/tools/sync_tools.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
'target_name': 'sync_tools_helper',
'type': 'static_library',
'defines': [
'SYNC_IMPLEMENTATION',
],
'include_dirs': [
'../..',
],
Expand Down

0 comments on commit 0ac9d1b

Please sign in to comment.