diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcrt/cfx_retain_ptr_unittest.cpp | 4 | ||||
| -rw-r--r-- | core/fxcrt/include/cfx_count_ref.h | 2 | ||||
| -rw-r--r-- | core/fxcrt/include/cfx_retain_ptr.h | 2 |
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(); } |