summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-09-08 15:47:46 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-08 15:47:46 -0700
commitcf7ac195266fe05f7548c531df32c2b4aa4b5608 (patch)
tree58b1b77ba09b3348e42a3257a8672ba83ca674ab /core
parent9a0736803ae6749ec508e1c3ff5f04a483bbcb56 (diff)
downloadpdfium-cf7ac195266fe05f7548c531df32c2b4aa4b5608.tar.xz
explicit operator bool for CFX_RetainPtr and CFX_CountRefchromium/2855
Review-Url: https://codereview.chromium.org/2324733003
Diffstat (limited to 'core')
-rw-r--r--core/fxcrt/cfx_retain_ptr_unittest.cpp4
-rw-r--r--core/fxcrt/include/cfx_count_ref.h2
-rw-r--r--core/fxcrt/include/cfx_retain_ptr.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_retain_ptr_unittest.cpp b/core/fxcrt/cfx_retain_ptr_unittest.cpp
index 4e74e52768..9da0d5ccf8 100644
--- a/core/fxcrt/cfx_retain_ptr_unittest.cpp
+++ b/core/fxcrt/cfx_retain_ptr_unittest.cpp
@@ -208,8 +208,8 @@ TEST(fxcrt, RetainPtrBool) {
PseudoRetainable obj1;
CFX_RetainPtr<PseudoRetainable> null_ptr;
CFX_RetainPtr<PseudoRetainable> obj1_ptr(&obj1);
- bool null_bool = null_ptr;
- bool obj1_bool = obj1_ptr;
+ bool null_bool = !!null_ptr;
+ bool obj1_bool = !!obj1_ptr;
EXPECT_FALSE(null_bool);
EXPECT_TRUE(obj1_bool);
}
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/include/cfx_count_ref.h
index 95132a73ca..d709efb67c 100644
--- a/core/fxcrt/include/cfx_count_ref.h
+++ b/core/fxcrt/include/cfx_count_ref.h
@@ -47,7 +47,7 @@ class CFX_CountRef {
return m_pObject == that.m_pObject;
}
bool operator!=(const CFX_CountRef& that) const { return !(*this == that); }
- operator bool() const { return m_pObject; }
+ explicit operator bool() const { return !!m_pObject; }
private:
class CountedObj : public ObjClass {
diff --git a/core/fxcrt/include/cfx_retain_ptr.h b/core/fxcrt/include/cfx_retain_ptr.h
index 25edd585cb..e40feb6b31 100644
--- a/core/fxcrt/include/cfx_retain_ptr.h
+++ b/core/fxcrt/include/cfx_retain_ptr.h
@@ -46,7 +46,7 @@ class CFX_RetainPtr {
bool operator!=(const CFX_RetainPtr& that) const { return !(*this == that); }
- operator bool() const { return !!m_pObj; }
+ explicit operator bool() const { return !!m_pObj; }
T& operator*() const { return *m_pObj.get(); }
T* operator->() const { return m_pObj.get(); }