| commit | edd824b94a4d1cbc50e1d63ac8d76e62761aa375 | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Wed Aug 31 17:34:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 17:34:11 2016 +0000 |
| tree | 4927c1c2e7064b2ddd686fc313d3a90d3ea843bb | |
| parent | ef1fb4889a3436060a0f8e995f0e4112419e847d [diff] | |
| parent | 4836d079805097ec91f3081df8eefb558df29f82 [diff] |
Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980 Change-Id: Ib0369e46dd1f1e56b3f660e615bc34c87120acaa
diff --git a/media/mca/filterfw/native/core/gl_frame.h b/media/mca/filterfw/native/core/gl_frame.h index f2a1ad5..fdbb1f5 100644 --- a/media/mca/filterfw/native/core/gl_frame.h +++ b/media/mca/filterfw/native/core/gl_frame.h
@@ -38,7 +38,7 @@ // Create an empty GL frame in the specified GL environment. Note, that the GLFrame does NOT // take ownership. The caller must make sure the GLEnv stays valid as long as the GLFrame is // alive. - GLFrame(GLEnv* gl_env); + explicit GLFrame(GLEnv* gl_env); // Deallocate a GL frame. ~GLFrame();
diff --git a/media/mca/filterfw/native/core/native_frame.h b/media/mca/filterfw/native/core/native_frame.h index 0d335b3..2da557d 100644 --- a/media/mca/filterfw/native/core/native_frame.h +++ b/media/mca/filterfw/native/core/native_frame.h
@@ -27,7 +27,7 @@ class NativeFrame { public: // Create an empty native frame. - NativeFrame(int size); + explicit NativeFrame(int size); ~NativeFrame();