diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 23:02:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 23:02:01 +0000 |
| commit | 2965dab9091382803430a0607118e20e93d2bd1d (patch) | |
| tree | 171368ac803c8ec49dea700767f57f7c00f0e5c1 /opengl/tests/EGLTest | |
| parent | d9799072de47ecd3e6d4cdb2bfd3db75f4d94bd5 (diff) | |
| parent | bceb29c83ea54d38b38e40d66402e56364cff56b (diff) | |
| download | frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.zip frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.gz frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.bz2 | |
am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
Fix clang -Wc++11-narrowing warnings.
Diffstat (limited to 'opengl/tests/EGLTest')
| -rw-r--r-- | opengl/tests/EGLTest/egl_cache_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tests/EGLTest/egl_cache_test.cpp b/opengl/tests/EGLTest/egl_cache_test.cpp index c7d9e3e..c5bf296 100644 --- a/opengl/tests/EGLTest/egl_cache_test.cpp +++ b/opengl/tests/EGLTest/egl_cache_test.cpp @@ -41,7 +41,7 @@ protected: }; TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) { - char buf[4] = { 0xee, 0xee, 0xee, 0xee }; + uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee }; mCache->setBlob("abcd", 4, "efgh", 4); ASSERT_EQ(0, mCache->getBlob("abcd", 4, buf, 4)); ASSERT_EQ(0xee, buf[0]); @@ -51,7 +51,7 @@ TEST_F(EGLCacheTest, UninitializedCacheAlwaysMisses) { } TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) { - char buf[4] = { 0xee, 0xee, 0xee, 0xee }; + uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee }; mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY)); mCache->setBlob("abcd", 4, "efgh", 4); ASSERT_EQ(4, mCache->getBlob("abcd", 4, buf, 4)); @@ -62,7 +62,7 @@ TEST_F(EGLCacheTest, InitializedCacheAlwaysHits) { } TEST_F(EGLCacheTest, TerminatedCacheAlwaysMisses) { - char buf[4] = { 0xee, 0xee, 0xee, 0xee }; + uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee }; mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY)); mCache->setBlob("abcd", 4, "efgh", 4); mCache->terminate(); @@ -94,7 +94,7 @@ protected: }; TEST_F(EGLCacheSerializationTest, ReinitializedCacheContainsValues) { - char buf[4] = { 0xee, 0xee, 0xee, 0xee }; + uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee }; mCache->setCacheFilename(mFilename); mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY)); mCache->setBlob("abcd", 4, "efgh", 4); |