diff options
author | James Hawkins <jhawkins@google.com> | 2016-02-25 10:59:30 -0800 |
---|---|---|
committer | James Hawkins <jhawkins@google.com> | 2016-02-25 10:59:30 -0800 |
commit | 9336b613ca5b5942ea62878f994dca770ad0fc17 (patch) | |
tree | 0600b69cb9446a62f0f559422f277482f3514373 /libpixelflinger | |
parent | d458730b649a044268807d1458867e3c1d0577b2 (diff) | |
download | system_core-9336b613ca5b5942ea62878f994dca770ad0fc17.tar.gz system_core-9336b613ca5b5942ea62878f994dca770ad0fc17.tar.bz2 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.h | 8 |
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: private: + // GGLAssembler hides RegisterAllocator's and ARMAssemblerProxy's reset + // methods by providing a reset method with a different parameter set. The + // intent of GGLAssembler's reset method is to wrap the inherited reset + // methods, so make these methods private in order to prevent direct calls + // to these methods from clients. + using RegisterAllocator::reset; + using ARMAssemblerProxy::reset; + struct tex_coord_t { reg_t s; reg_t t; |