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

Treehugger Robot · android-build-merge-worker-robot · commit 3cc659d71ed2 · 2024-10-15T20:15:30.000Z
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>
diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
@@ -1169,7 +1169,7 @@ inline Json::Value ArrayToJsonValue(uint32_t count, const T* values) {
   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 @@ inline bool AsArray(Json::Value* json_value, uint32_t count, T* values) {
   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);
 }

Original file line number	Diff line number	Diff line change
`@@ -1169,7 +1169,7 @@ inline Json::Value ArrayToJsonValue(uint32_t count, const T* values) {`
`1169`	`1169`	`return array;`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`		`-template <typename T, unsigned int N>`
	`1172`	`+template <typename T, size_t N>`
`1173`	`1173`	`inline Json::Value ToJsonValue(const T (&value)[N]) {`
`1174`	`1174`	`return ArrayToJsonValue(N, value);`
`1175`	`1175`	`}`
`@@ -1293,7 +1293,7 @@ inline bool AsArray(Json::Value* json_value, uint32_t count, T* values) {`
`1293`	`1293`	`return true;`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`		`-template <typename T, unsigned int N>`
	`1296`	`+template <typename T, size_t N>`
`1297`	`1297`	`inline bool AsValue(Json::Value* json_value, T (*value)[N]) {`
`1298`	`1298`	`return AsArray(json_value, N, *value);`
`1299`	`1299`	`}`