commit 3cc659d71ed29ecba2517a2285cfc72772c4f5c6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 15 20:15:30 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 15 20:15:30 2024 +0000
tree 805df2cfc0f95fe2feb8e6c4cf6583051df269cd
parent 5b491d7ef834d9a3430be9c13139cd0274e01ebf
parent 86e7e6be0ec898779c738f4507ad1e25c7e82eeb

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

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

Change-Id: I799826fb23c590accb2d700985a15bd20227eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vulkan/vkjson/vkjson.cc

diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index 0284192..bfb7bd6 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -1169,7 +1169,7 @@
   return array;
 }
 
-template <typename T, unsigned int N>
+template <typename T, size_t N>
 inline Json::Value ToJsonValue(const T (&value)[N]) {
   return ArrayToJsonValue(N, value);
 }
@@ -1293,7 +1293,7 @@
   return true;
 }
 
-template <typename T, unsigned int N>
+template <typename T, size_t N>
 inline bool AsValue(Json::Value* json_value, T (*value)[N]) {
   return AsArray(json_value, N, *value);
 }