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/internal_api | |
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/internal_api')
-rw-r--r-- | sync/internal_api/public/util/proto_value_ptr_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sync/internal_api/public/util/proto_value_ptr_unittest.cc b/sync/internal_api/public/util/proto_value_ptr_unittest.cc index f439825..1420980 100644 --- a/sync/internal_api/public/util/proto_value_ptr_unittest.cc +++ b/sync/internal_api/public/util/proto_value_ptr_unittest.cc @@ -45,7 +45,7 @@ class TestValue { int value() const { return value_->value(); } IntValue* value_ptr() const { return value_.get(); } - bool is_initialized() const { return value_; } + bool is_initialized() const { return !!value_; } bool is_default() const { return is_default_; } // TestValue uses the default traits struct with ProtoValuePtr<TestValue>. |