commit 60924a144f6a32d4bcf25c726e5582085d532171
author Dennis Kormalev <denk@google.com> Thu Jun 23 22:29:11 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 23 22:29:11 2022 +0000
tree 1eda9a74a996a9b9b2aadab53c04f89447c2410e
parent 0c47c3378fca1b86f1760bbae6b8d2bade227ce2

pw_protobuf: Break the ambiguity for spans in generated code

Some std::span implementations has an ambiguity in the resolving
(ptr, 0) span construction. This CL adds explicit size_t for the second
arg to avoid it.

Change-Id: Ib2e0c3319a5841f64981d7f4c5d62b5d3dea8ebd
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/99285
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Armando Montanez <amontanez@google.com>
Pigweed-Auto-Submit: Dennis Kormalev <denk@google.com>

pw_protobuf/py/pw_protobuf/codegen_pwpb.py

diff --git a/pw_protobuf/py/pw_protobuf/codegen_pwpb.py b/pw_protobuf/py/pw_protobuf/codegen_pwpb.py
index 36101a3..f5c53dd 100644
--- a/pw_protobuf/py/pw_protobuf/codegen_pwpb.py
+++ b/pw_protobuf/py/pw_protobuf/codegen_pwpb.py
@@ -2124,9 +2124,10 @@
     output.write_line('};')
     output.write_line('PW_MODIFY_DIAGNOSTICS_POP();')
 
-    output.write_line('inline constexpr std::span<const {}::MessageField> '
-                      'kMessageFields = {{ _kMessageFields, {} }};'.format(
-                          PROTOBUF_NAMESPACE, len(properties)))
+    output.write_line(
+        'inline constexpr std::span<const {}::MessageField> '
+        'kMessageFields = {{ _kMessageFields, size_t({}) }};'.format(
+            PROTOBUF_NAMESPACE, len(properties)))
 
     output.write_line(f'}}  // namespace {namespace}')