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

Commit 94b29e54 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "vkjson: Move redefinition of FALLTHROUGH_INTENDED" into main

parents 072c35ce f591be70

vulkan/vkjson/vkjson.cc

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ 


namespace {



/*

 * Annotation to tell clang that we intend to fall through from one case to

 * another in a switch. Sourced from android-base/macros.h.

 */

#define FALLTHROUGH_INTENDED [[clang::fallthrough]]



inline bool IsIntegral(double value) {

#if defined(ANDROID)

  // Android NDK doesn't provide std::trunc yet

vulkan/vkjson/vkjson.h

+0 −6
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ 
#undef max

#endif



/*

 * Annotation to tell clang that we intend to fall through from one case to

 * another in a switch. Sourced from android-base/macros.h.

 */

#define FALLTHROUGH_INTENDED [[clang::fallthrough]]



struct VkJsonLayer {

  VkLayerProperties properties;

  std::vector<VkExtensionProperties> extensions;