diff options
author | 2018-07-20 13:39:55 -0700 | |
---|---|---|
committer | 2018-08-02 14:14:35 -0700 | |
commit | 19d5c00350893a2c9408d8d5a93d1d705b278562 (patch) | |
tree | 26818a9962e8ab05f532a77e3ab6f284572baa51 /cmds/flatland/Main.cpp | |
parent | 519485d161e1cdcb11a1898b065710a5d9239cb5 (diff) |
[cmds] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: I1635395d653ace5a11c75795f4a7d2bf2d9e0b1b
Merged-In: I73a0a82e3e32001f8ffb0880250c7023dd8290d3
Diffstat (limited to 'cmds/flatland/Main.cpp')
-rw-r--r-- | cmds/flatland/Main.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmds/flatland/Main.cpp b/cmds/flatland/Main.cpp index 3d7cac0bb3..7ceb397032 100644 --- a/cmds/flatland/Main.cpp +++ b/cmds/flatland/Main.cpp @@ -284,7 +284,7 @@ class Layer { public: Layer() : - mGLHelper(NULL), + mGLHelper(nullptr), mSurface(EGL_NO_SURFACE) { } @@ -316,23 +316,23 @@ public: } void tearDown() { - if (mComposer != NULL) { + if (mComposer != nullptr) { mComposer->tearDown(); delete mComposer; - mComposer = NULL; + mComposer = nullptr; } - if (mRenderer != NULL) { + if (mRenderer != nullptr) { mRenderer->tearDown(); delete mRenderer; - mRenderer = NULL; + mRenderer = nullptr; } if (mSurface != EGL_NO_SURFACE) { mGLHelper->destroySurface(&mSurface); mGLConsumer->abandon(); } - mGLHelper = NULL; + mGLHelper = nullptr; mGLConsumer.clear(); } @@ -377,7 +377,7 @@ public: mDesc(desc), mInstance(instance), mNumLayers(countLayers(desc)), - mGLHelper(NULL), + mGLHelper(nullptr), mSurface(EGL_NO_SURFACE), mWindowSurface(EGL_NO_SURFACE) { } @@ -443,7 +443,7 @@ public: mLayers[i].tearDown(); } - if (mGLHelper != NULL) { + if (mGLHelper != nullptr) { if (mWindowSurface != EGL_NO_SURFACE) { mGLHelper->destroySurface(&mWindowSurface); } @@ -453,7 +453,7 @@ public: mSurfaceControl.clear(); mGLHelper->tearDown(); delete mGLHelper; - mGLHelper = NULL; + mGLHelper = nullptr; } } @@ -553,7 +553,7 @@ private: static size_t countLayers(const BenchmarkDesc& desc) { size_t i; for (i = 0; i < MAX_NUM_LAYERS; i++) { - if (desc.layers[i].rendererFactory == NULL) { + if (desc.layers[i].rendererFactory == nullptr) { break; } } |