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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/scoped_test_nss_db.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/scoped_test_nss_db.h b/crypto/scoped_test_nss_db.h index a305b7f..c01653f 100644 --- a/crypto/scoped_test_nss_db.h +++ b/crypto/scoped_test_nss_db.h @@ -20,7 +20,7 @@ class CRYPTO_EXPORT ScopedTestNSSDB { ScopedTestNSSDB(); ~ScopedTestNSSDB(); - bool is_open() const { return slot_; } + bool is_open() const { return !!slot_; } PK11SlotInfo* slot() const { return slot_.get(); } private: |