summaryrefslogtreecommitdiff
path: root/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
diff options
context:
space:
mode:
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)