From 59699610ecdd0b9506de1e439371ce3df6a02f87 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 23 Jun 2021 08:46:39 -0400 Subject: [PATCH] Remove casts now that our enums are the right size. (#7841) https://github.com/project-chip/connectedhomeip/pull/7746 made the enums be sized correctly. Fixes https://github.com/project-chip/connectedhomeip/issues/7622 --- .../linux/include/keypad-input/KeypadInputManager.cpp | 6 ++---- .../linux/include/media-playback/MediaPlaybackManager.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp index 5f026cb09b4630..aadfdb9eabacf6 100644 --- a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp +++ b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp @@ -53,11 +53,9 @@ EmberAfKeypadInputStatus KeypadInputManager::proxyKeypadInputRequest(EmberAfKeyp static void sendResponse(const char * responseName, EmberAfKeypadInputStatus keypadInputStatus) { - // TODO: Once our enums are sized properly, or once we stop depending on the - // value being a certain type, we can remove the static_cast. For now the - // cast is safe because all EmberAfKeypadInputStatus values fit in uint32_t. + static_assert(std::is_same, uint8_t>::value, "Wrong enum size"); emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_KEYPAD_INPUT_CLUSTER_ID, - ZCL_SEND_KEY_RESPONSE_COMMAND_ID, "u", static_cast(keypadInputStatus)); + ZCL_SEND_KEY_RESPONSE_COMMAND_ID, "u", keypadInputStatus); EmberStatus status = emberAfSendResponse(); if (status != EMBER_SUCCESS) diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp index 7ec3d6147fc856..f50efd601806b4 100644 --- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp +++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp @@ -83,11 +83,9 @@ void MediaPlaybackManager::storeNewPlaybackState(chip::EndpointId endpoint, uint static void sendResponse(const char * responseName, chip::CommandId commandId, EmberAfMediaPlaybackStatus mediaPlaybackStatus) { - // TODO: Once our enums are sized properly, or once we stop depending on the - // value being a certain type, we can remove the static_cast. For now the - // cast is safe because all EmberAfKeypadInputStatus values fit in uint32_t. + static_assert(std::is_same, uint8_t>::value, "Wrong enum size"); emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), ZCL_MEDIA_PLAYBACK_CLUSTER_ID, - commandId, "u", static_cast(mediaPlaybackStatus)); + commandId, "u", mediaPlaybackStatus); EmberStatus status = emberAfSendResponse(); if (status != EMBER_SUCCESS)