diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
commit | 412e908082a361d0fd9591eab939e96a882212f1 (patch) | |
tree | 11726052ae08f13dc5a05a82cbce870758580aeb /core/include/fxcrt/fx_basic.h | |
parent | 96660d6f382204339d6b1aadc3913303d436e252 (diff) | |
download | pdfium-412e908082a361d0fd9591eab939e96a882212f1.tar.xz |
Merge to XFA: Get rid of most instance of 'foo == NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520063002 .
(cherry picked from commit e385244f8cd6ae376f6b3cf1265a0795d5d30eff)
Review URL: https://codereview.chromium.org/1528763003 .
Diffstat (limited to 'core/include/fxcrt/fx_basic.h')
-rw-r--r-- | core/include/fxcrt/fx_basic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index e1c384f2c5..c5b8b38f3f 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -989,7 +989,7 @@ class CFX_CountRef { void operator=(void* p) { FXSYS_assert(p == 0); - if (m_pObject == NULL) { + if (!m_pObject) { return; } m_pObject->m_RefCount--; @@ -1003,12 +1003,12 @@ class CFX_CountRef { operator const ObjClass*() const { return m_pObject; } - FX_BOOL IsNull() const { return m_pObject == NULL; } + FX_BOOL IsNull() const { return !m_pObject; } - FX_BOOL NotNull() const { return m_pObject != NULL; } + FX_BOOL NotNull() const { return !IsNull(); } ObjClass* GetModify() { - if (m_pObject == NULL) { + if (!m_pObject) { m_pObject = new CountedObj; m_pObject->m_RefCount = 1; } else if (m_pObject->m_RefCount > 1) { @@ -1021,7 +1021,7 @@ class CFX_CountRef { } void SetNull() { - if (m_pObject == NULL) { + if (!m_pObject) { return; } m_pObject->m_RefCount--; |