commit b72f19ee9f61bdee774aae0ce8c3a0e511d2ae30
author Yifan Hong <elsk@google.com> Wed Jun 27 16:58:56 2018 -0700
committer Yifan Hong <elsk@google.com> Thu Jun 28 13:23:15 2018 -0700
tree 18a299f0773e0be8e1bab1cbbaf055bdef5675d1
parent db730530656f717cdb925c058461a4485db4b32b

lshal: --types works with --neat

Test: lshal_test
Change-Id: Ia2e6a2258b455605929a19da0c3213eae5f9d14f

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index c68d197..d497e5c 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -502,8 +502,11 @@
 
 void ListCommand::dumpTable(const NullableOStream<std::ostream>& out) const {
     if (mNeat) {
-        MergedTable({&mServicesTable, &mPassthroughRefTable, &mImplementationsTable})
-            .createTextTable().dump(out.buf());
+        std::vector<const Table*> tables;
+        forEachTable([&tables](const Table &table) {
+            tables.push_back(&table);
+        });
+        MergedTable(std::move(tables)).createTextTable().dump(out.buf());
         return;
     }