diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-11-13 15:13:43 -0800 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2019-11-13 15:13:43 -0800 |
| commit | 3bbf9c35e5d96ec04aa232f627c4daa1e71942e5 (patch) | |
| tree | ed90e57560d2118e18f68e271f2a0db808bed247 | |
| parent | 25128ad4ae1c8a05c1cb2787e9b4fb19a9cc741f (diff) | |
| download | cuttlefish_common-3bbf9c35e5d96ec04aa232f627c4daa1e71942e5.tar.gz | |
cuttlefish: gralloc: fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.
Bug: 139945549
Test: lunch aosp_cf_x86_phone-userdebug && mm
Change-Id: I815745dd119dc383e78e2036572aa56be91a03b0
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
| -rw-r--r-- | guest/hals/gralloc/gralloc.cpp | 4 | ||||
| -rw-r--r-- | guest/hals/gralloc/legacy/gralloc.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guest/hals/gralloc/gralloc.cpp b/guest/hals/gralloc/gralloc.cpp index bf672eea..d21d918d 100644 --- a/guest/hals/gralloc/gralloc.cpp +++ b/guest/hals/gralloc/gralloc.cpp @@ -312,9 +312,9 @@ struct vsoc_gralloc_module_t HAL_MODULE_INFO_SYM = { .unregisterBuffer = unregister_buffer, .lock = lock, .unlock = unlock, - .lock_ycbcr = lock_ycbcr, .perform = NULL, - .validateBufferSize = NULL, + .lock_ycbcr = lock_ycbcr, .getTransportSize = NULL, + .validateBufferSize = NULL, }, }; diff --git a/guest/hals/gralloc/legacy/gralloc.cpp b/guest/hals/gralloc/legacy/gralloc.cpp index a100a764..8a0cbd2e 100644 --- a/guest/hals/gralloc/legacy/gralloc.cpp +++ b/guest/hals/gralloc/legacy/gralloc.cpp @@ -194,11 +194,11 @@ struct private_module_t HAL_MODULE_INFO_SYM = { .unregisterBuffer = gralloc_unregister_buffer, .lock = gralloc_lock, .unlock = gralloc_unlock, - .validateBufferSize = gralloc_validate_buffer_size, - .getTransportSize = gralloc_get_transport_size, #ifdef GRALLOC_MODULE_API_VERSION_0_2 .perform = NULL, .lock_ycbcr = gralloc_lock_ycbcr, #endif + .getTransportSize = gralloc_get_transport_size, + .validateBufferSize = gralloc_validate_buffer_size, }, }; |