commit d2749b71e2b981598d9cabbbfc009ee155a1f14f
author Steven Moreland <smoreland@google.com> Tue Nov 15 19:45:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 15 19:45:27 2016 +0000
tree 66ce41f1680b09502240933fbd70cb79b06ead04
parent e2e784984e2eb1cfcb95adb7614faf4d5650c66f
parent ab099dd0da64f2e1e16e3fa63ff45cf044238f99

Merge "Prevent errors in compilation of c++-impl."
am: ab099dd0da

Change-Id: Ibd7a034ea6bbbfb9c4360c28a9d3d5bd5fd13dc8

generateCppImpl.cpp

diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index bfd8950..939bcc2 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -148,10 +148,11 @@
         out << "using " << name.cppName() << ";\n";
     }
 
+    out << "using ::android::hardware::hidl_array;\n";
+    out << "using ::android::hardware::hidl_string;\n";
+    out << "using ::android::hardware::hidl_vec;\n";
     out << "using ::android::hardware::Return;\n";
     out << "using ::android::hardware::Void;\n";
-    out << "using ::android::hardware::hidl_vec;\n";
-    out << "using ::android::hardware::hidl_string;\n";
     out << "using ::android::sp;\n";
 
     out << "\n";

main.cpp

diff --git a/main.cpp b/main.cpp
index 29de12c..a4f5dc0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1171,14 +1171,14 @@
 
             case 'L':
             {
-                CHECK(outputFormat == nullptr); // only one -L option
+                CHECK(outputFormat == nullptr) << "Only one -L option allowed.";
                 for (auto &e : formats) {
                     if (e.mKey == optarg) {
                         outputFormat = &e;
                         break;
                     }
                 }
-                CHECK(outputFormat != nullptr);
+                CHECK(outputFormat != nullptr) << "Output format not recognized.";
                 break;
             }