summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-14 18:27:25 -0800
committerLei Zhang <thestig@chromium.org>2015-12-14 18:27:25 -0800
commit96660d6f382204339d6b1aadc3913303d436e252 (patch)
treeb5f84756e1a89251831cebc05b9d4e1f6cb2027b /core/include
parentd983b09c3ae29a97cba8e9ec9c6351545f6087ee (diff)
downloadpdfium-96660d6f382204339d6b1aadc3913303d436e252.tar.xz
Merge to XFA: Get rid of most instance of 'foo != NULL'
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1512763013 . (cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7) Review URL: https://codereview.chromium.org/1529553003 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxcrt/fx_basic.h2
-rw-r--r--core/include/fxcrt/fx_ext.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index d5673271e6..e1c384f2c5 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -1176,7 +1176,7 @@ class CFX_ListArrayTemplate {
T2& operator[](int32_t nIndex) {
uint8_t* data = m_Data.GetAt(nIndex);
- FXSYS_assert(data != NULL);
+ FXSYS_assert(data);
return (T2&)(*(volatile T2*)data);
}
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 48801bb196..6cba8eeb91 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -93,7 +93,7 @@ template <class baseType>
class CFX_SSortTemplate {
public:
void ShellSort(baseType* pArray, int32_t iCount) {
- FXSYS_assert(pArray != NULL && iCount > 0);
+ FXSYS_assert(pArray && iCount > 0);
int32_t i, j, gap;
baseType v1, v2;
gap = iCount >> 1;