Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: core/include/fxcrt/fx_basic.h

Issue 1528763003: Merge to XFA: Get rid of most instance of 'foo == NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/include/fxcrt/fx_basic.h
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index e1c384f2c529609d60d1027ed2a3bbccfa8899f7..c5b8b38f3ff80c5360bf46afcd2613e76fb92d6e 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--;

Powered by Google App Engine
This is Rietveld 408576698