diff options
| author | dcheng <dcheng@chromium.org> | 2016-01-19 17:41:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 01:43:18 +0000 |
| commit | 5d64b5269aa9293c992f41235290366d21cb38ac (patch) | |
| tree | 2cf3091ddc052686b434d4a4f6d90cfd518d7004 /sync/engine | |
| parent | ec933290454c4a92f9dd720fc38191f732bdfc7b (diff) | |
| download | chromium_src-5d64b5269aa9293c992f41235290366d21cb38ac.zip chromium_src-5d64b5269aa9293c992f41235290366d21cb38ac.tar.gz chromium_src-5d64b5269aa9293c992f41235290366d21cb38ac.tar.bz2 | |
Fix remaining incompatibilities between scoped_ptr and unique_ptr.
scoped_ptr is more convertible to bool than std::unique_ptr.
bool x = scoped_ptr<int>(); // compiles
bool y = std::unique_ptr<int>(); // explodes
std::unique_ptr is not streamable:
LOG(ERROR) << scoped_ptr<int>(); // compiles
LOG(ERROR) << std::unique_ptr<int>(); // explodes
BUG=579269,579270
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1609923002
Cr-Commit-Position: refs/heads/master@{#370266}
Diffstat (limited to 'sync/engine')
| -rw-r--r-- | sync/engine/non_blocking_type_commit_contribution.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/non_blocking_type_commit_contribution.cc b/sync/engine/non_blocking_type_commit_contribution.cc index 5216ed0..d4506b3 100644 --- a/sync/engine/non_blocking_type_commit_contribution.cc +++ b/sync/engine/non_blocking_type_commit_contribution.cc @@ -62,13 +62,13 @@ syncer::SyncerError NonBlockingTypeCommitContribution::ProcessCommitResponse( case sync_pb::CommitResponse::INVALID_MESSAGE: LOG(ERROR) << "Server reports commit message is invalid."; DLOG(ERROR) << "Message was: " - << syncer::SyncEntityToValue(entities_.Get(i), false); + << syncer::SyncEntityToValue(entities_.Get(i), false).get(); unknown_error = true; break; case sync_pb::CommitResponse::CONFLICT: DVLOG(1) << "Server reports conflict for commit message."; DVLOG(1) << "Message was: " - << syncer::SyncEntityToValue(entities_.Get(i), false); + << syncer::SyncEntityToValue(entities_.Get(i), false).get(); commit_conflict = true; break; case sync_pb::CommitResponse::SUCCESS: { |