commit 27e1ff69d60ac8b313761afb6fa45639b2e27bbf
author Nick Desaulniers <ndesaulniers@google.com> Mon Oct 07 23:13:10 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 08 16:57:51 2019 +0000
tree 879bfd1d9246fc5bfc1f53c2af5fdb05e27ea474
parent ddec09dd4f9ca1c3bf7ee590b92cc188caf818c9

[AIDL] fix -Wreorder-init-list

C++20 really wants members ordered unlike C99.

Bug: 139945549
Test: mm
Change-Id: If338adf32f5c93754e0bb45a28ab3818470190f5
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

generate_java.cpp

diff --git a/generate_java.cpp b/generate_java.cpp
index c6b26ba..ea23016 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -171,8 +171,8 @@
         .writer = *(writer.get()),
         .typenames = typenames,
         .type = field->GetType(),
-        .var = field->GetName(),
         .parcel = parcel_variable->name,
+        .var = field->GetName(),
         .is_return_value = false,
     };
     WriteToParcelFor(context);
@@ -219,8 +219,8 @@
         .writer = *(writer.get()),
         .typenames = typenames,
         .type = field->GetType(),
-        .var = field->GetName(),
         .parcel = parcel_variable->name,
+        .var = field->GetName(),
         .is_classloader_created = &is_classloader_created,
     };
     context.writer.Indent();

generate_java_binder.cpp

diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index 62bd89c..afe2b17 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -372,8 +372,8 @@
       .writer = *(writer.get()),
       .typenames = typenames,
       .type = type,
-      .var = v->name,
       .parcel = parcel->name,
+      .var = v->name,
       .is_return_value = is_return_value,
   };
   WriteToParcelFor(context);
@@ -444,8 +444,8 @@
         CodeGeneratorContext context{.writer = *(writer.get()),
                                      .typenames = typenames,
                                      .type = arg->GetType(),
-                                     .var = v->name,
                                      .parcel = transact_data->name,
+                                     .var = v->name,
                                      .is_classloader_created = &is_classloader_created};
         CreateFromParcelFor(context);
         writer->Close();
@@ -703,8 +703,8 @@
       CodeGeneratorContext context{.writer = *(writer.get()),
                                    .typenames = typenames,
                                    .type = method.GetType(),
-                                   .var = _result->name,
                                    .parcel = _reply->name,
+                                   .var = _result->name,
                                    .is_classloader_created = &is_classloader_created};
       CreateFromParcelFor(context);
       writer->Close();
@@ -719,8 +719,8 @@
         CodeGeneratorContext context{.writer = *(writer.get()),
                                      .typenames = typenames,
                                      .type = arg->GetType(),
-                                     .var = arg->GetName(),
                                      .parcel = _reply->name,
+                                     .var = arg->GetName(),
                                      .is_classloader_created = &is_classloader_created};
         ReadFromParcelFor(context);
         writer->Close();