summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hawkins2016-02-25 12:59:30 -0600
committerJames Hawkins2016-02-25 12:59:30 -0600
commit9336b613ca5b5942ea62878f994dca770ad0fc17 (patch)
tree0600b69cb9446a62f0f559422f277482f3514373 /libpixelflinger
parentd458730b649a044268807d1458867e3c1d0577b2 (diff)
downloadplatform-system-core-9336b613ca5b5942ea62878f994dca770ad0fc17.tar.gz
platform-system-core-9336b613ca5b5942ea62878f994dca770ad0fc17.tar.xz
platform-system-core-9336b613ca5b5942ea62878f994dca770ad0fc17.zip
libpixelflinger: Fix -Woverloaded-virtual warnings.
GGLAssembler inherits a reset method from two parent classes, but it provides a separate reset method with a different signature, thus hiding the inherited reset methods. The fix is to explicitly hide the inherited reset methods as private. Bug: 27346663 Change-Id: Ic64b00acb6d77fb791cfdeade9ef7e20148817c1
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/codeflinger/GGLAssembler.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libpixelflinger/codeflinger/GGLAssembler.h b/libpixelflinger/codeflinger/GGLAssembler.h
index 9db20dfd3..ecc242a50 100644
--- a/libpixelflinger/codeflinger/GGLAssembler.h
+++ b/libpixelflinger/codeflinger/GGLAssembler.h
@@ -288,6 +288,14 @@ public:
288 288
289 289
290private: 290private:
291 // GGLAssembler hides RegisterAllocator's and ARMAssemblerProxy's reset
292 // methods by providing a reset method with a different parameter set. The
293 // intent of GGLAssembler's reset method is to wrap the inherited reset
294 // methods, so make these methods private in order to prevent direct calls
295 // to these methods from clients.
296 using RegisterAllocator::reset;
297 using ARMAssemblerProxy::reset;
298
291 struct tex_coord_t { 299 struct tex_coord_t {
292 reg_t s; 300 reg_t s;
293 reg_t t; 301 reg_t t;