summaryrefslogtreecommitdiff
path: root/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-01 10:55:39 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-02-01 10:55:39 +0000
commit9ebc22008141c79bf5a266b146878eee77f47e20 (patch)
treea50626055ff02522fd209d0174d16251c8a8b02f /mojo/public/tools/bindings/generators/mojom_cpp_generator.py
parent69501071b35cdb2b8761df3a7d540c9fe7fcb4a0 (diff)
parent57f727b567b5eed80427cdb3b5526dbbb4a32f6b (diff)
downloadlibchrome-9ebc22008141c79bf5a266b146878eee77f47e20.tar.gz
Snap for 9550355 from 57f727b567b5eed80427cdb3b5526dbbb4a32f6b to sdk-releaseplatform-tools-34.0.0platform-tools-33.0.4
Change-Id: Ic73f4fdc695165a0dcc59458bf248c2a57dab5b6
Diffstat (limited to 'mojo/public/tools/bindings/generators/mojom_cpp_generator.py')
-rw-r--r--mojo/public/tools/bindings/generators/mojom_cpp_generator.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
index ceded69e1f..97bc827c9e 100644
--- a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
+++ b/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
@@ -266,7 +266,7 @@ class Generator(generator.Generator):
for typename in
self.module.structs + all_enums + self.module.unions)
headers = set()
- for typename, typemap in self.typemap.iteritems():
+ for typename, typemap in self.typemap.items():
if typename in types:
headers.update(typemap.get("public_headers", []))
return sorted(headers)
@@ -788,7 +788,7 @@ class Generator(generator.Generator):
if param_counts[-1] != version.num_fields:
param_counts.append(version.num_fields)
- ordinal_fields = sorted(struct.fields, key=lambda field: field.ordinal)
+ ordinal_fields = sorted(struct.fields, key=lambda field: field.ordinal if field.ordinal != None else -1)
return (StructConstructor(struct.fields, ordinal_fields[:param_count])
for param_count in param_counts)