diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-05-05 21:19:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-05 21:19:04 +0000 |
| commit | caff47a0c495734d344515dafb193ac8a3d6a498 (patch) | |
| tree | 1298f158df6c9677b6cd17d3c854aeeccd532b9e | |
| parent | 90c04fe6791b619be58d13d785a1fbe8f35a45ab (diff) | |
| parent | d9cdadb38229e84f83c56ff2fe195a6a6ef535c3 (diff) | |
| download | native-caff47a0c495734d344515dafb193ac8a3d6a498.tar.gz | |
Merge "Fix google-explicit-constructor warnings."
| -rw-r--r-- | libs/gui/tests/SurfaceTextureClient_test.cpp | 2 | ||||
| -rw-r--r-- | libs/gui/tests/SurfaceTextureGL_test.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index 1a50b2480d..2e56419ebf 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -519,7 +519,7 @@ TEST_F(SurfaceTextureClientTest, DISABLED_SurfaceTextureSyncModeWaitRetire) { return false; } public: - MyThread(const sp<GLConsumer>& mST) + explicit MyThread(const sp<GLConsumer>& mST) : mST(mST), mBufferRetired(false) { ctx = eglGetCurrentContext(); sur = eglGetCurrentSurface(EGL_DRAW); diff --git a/libs/gui/tests/SurfaceTextureGL_test.cpp b/libs/gui/tests/SurfaceTextureGL_test.cpp index fad133fcb8..bf87061f74 100644 --- a/libs/gui/tests/SurfaceTextureGL_test.cpp +++ b/libs/gui/tests/SurfaceTextureGL_test.cpp @@ -426,7 +426,7 @@ TEST_F(SurfaceTextureGLTest, DisconnectStressTest) { class ProducerThread : public Thread { public: - ProducerThread(const sp<ANativeWindow>& anw): + explicit ProducerThread(const sp<ANativeWindow>& anw): mANW(anw) { } @@ -603,7 +603,7 @@ TEST_F(SurfaceTextureGLTest, CroppedScalingMode) { TEST_F(SurfaceTextureGLTest, AbandonUnblocksDequeueBuffer) { class ProducerThread : public Thread { public: - ProducerThread(const sp<ANativeWindow>& anw): + explicit ProducerThread(const sp<ANativeWindow>& anw): mANW(anw), mDequeueError(NO_ERROR) { } |