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

Commit 3cc659d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix build on ToT Clang" into main am: 86e7e6be 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3308593



Change-Id: I799826fb23c590accb2d700985a15bd20227eb59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b491d7e 86e7e6be

vulkan/vkjson/vkjson.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -1169,7 +1169,7 @@ inline Json::Value ArrayToJsonValue(uint32_t count, const T* values) { 
  return array;

  return array;

}

}





template <typename T, unsigned int N>

template <typename T, size_t N>

inline Json::Value ToJsonValue(const T (&value)[N]) {

inline Json::Value ToJsonValue(const T (&value)[N]) {

  return ArrayToJsonValue(N, value);

  return ArrayToJsonValue(N, value);

}

}
@@ -1293,7 +1293,7 @@ inline bool AsArray(Json::Value* json_value, uint32_t count, T* values) { 
  return true;

  return true;

}

}





template <typename T, unsigned int N>

template <typename T, size_t N>

inline bool AsValue(Json::Value* json_value, T (*value)[N]) {

inline bool AsValue(Json::Value* json_value, T (*value)[N]) {

  return AsArray(json_value, N, *value);

  return AsArray(json_value, N, *value);

}

}