Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit df20a560 authored by bartcubbins's avatar bartcubbins Committed by Bernhard Thoben
Browse files

kitakami-common: camera: QCamera2: Wrap LOGE macro with braces in ADD_SET_PARAM_ENTRY_TO_BATCH



Wrap LOGE macro with braces in ADD_SET_PARAM_ENTRY_TO_BATCH macro to
avoid new clang-12 compound punctuation token warning

QCamera2/HAL/QCamera2HWICallbacks.cpp:2158:5: error: '(' and '{' tokens
introducing statement expression appear in different macro expansion
contexts [-Werror,-Wcompound-token-split-by-macro]
    ADD_SET_PARAM_ENTRY_TO_BATCH(pMetaData,
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
QCamera2/stack/common/cam_intf.h:858:6: note: expanded from macro 'ADD_SET_PARAM_ENTRY_TO_BATCH'
    ((LOGE("Unable to set metadata TABLE_PTR:%p META_ID:%d", \
     ^
QCamera2/HAL/QCamera2HWICallbacks.cpp:2158:5: note: '{' token is here
    ADD_SET_PARAM_ENTRY_TO_BATCH(pMetaData,
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
QCamera2/stack/common/cam_intf.h:858:7: note: expanded from macro 'ADD_SET_PARAM_ENTRY_TO_BATCH'
    ((LOGE("Unable to set metadata TABLE_PTR:%p META_ID:%d", \
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h:105:28: note: expanded from macro 'LOGE'
                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h:90:5: note: expanded from macro 'CLOGE'
    CLOGx(module, CAM_GLBL_DBG_ERR, fmt, ##args)
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h:66:68: note: expanded from macro 'CLOGx'
                                                                   ^

Signed-off-by: default avatarPavel Dubrova <pashadubrova@gmail.com>
Change-Id: I07388378044e1d6c323e8241752a7464395b1334
parent 85514d29
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment