commit 4a385ed6b8c637c832cc351af43077a525633abb
author Steven Moreland <smoreland@google.com> Mon Dec 09 14:47:18 2019 -0800
committer Steven Moreland <smoreland@google.com> Mon Dec 09 14:53:53 2019 -0800
tree 2658b720e8813b0f35dcb4b0f8103883071d2a2d
parent f6316c53165c249f09c7e340d4ef50253afa5cb2

Take advantage of moved get*Components result.

In preparation to remove version from namespace in -Lc++-impl
generation.

Less code = happy.

Bug: 145814082
Test: ./test/run_all_device_tests.sh
Change-Id: Icd7339f76abdf091554a1db8fca44cd9898367ca

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index ba12300..510a96e 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -35,16 +35,6 @@
 
 namespace android {
 
-void AST::getPackageComponents(
-        std::vector<std::string> *components) const {
-    mPackage.getPackageComponents(components);
-}
-
-void AST::getPackageAndVersionComponents(
-        std::vector<std::string> *components, bool cpp_compatible) const {
-    mPackage.getPackageAndVersionComponents(components, cpp_compatible);
-}
-
 std::string AST::makeHeaderGuard(const std::string &baseName,
                                  bool indicateGenerated) const {
     std::string guard;
@@ -68,8 +58,8 @@
 
     out << "#include <";
 
-    std::vector<std::string> components;
-    package.getPackageAndVersionComponents(&components, false /* cpp_compatible */);
+    std::vector<std::string> components =
+            package.getPackageAndVersionComponents(false /* sanitized */);
 
     for (const auto &component : components) {
         out << component << "/";
@@ -80,9 +70,8 @@
 }
 
 void AST::enterLeaveNamespace(Formatter &out, bool enter) const {
-    std::vector<std::string> packageComponents;
-    getPackageAndVersionComponents(
-            &packageComponents, true /* cpp_compatible */);
+    std::vector<std::string> packageComponents =
+            mPackage.getPackageAndVersionComponents(true /* sanitized */);
 
     if (enter) {
         for (const auto &component : packageComponents) {
@@ -765,10 +754,6 @@
 
     out << "#include <hidl/HidlTransportSupport.h>\n\n";
 
-    std::vector<std::string> packageComponents;
-    getPackageAndVersionComponents(
-            &packageComponents, false /* cpp_compatible */);
-
     generateCppPackageInclude(out, mPackage, iface->getHwName());
     out << "\n";
 
@@ -1649,10 +1634,6 @@
     out << "#ifndef " << guard << "\n";
     out << "#define " << guard << "\n\n";
 
-    std::vector<std::string> packageComponents;
-    getPackageAndVersionComponents(
-            &packageComponents, false /* cpp_compatible */);
-
     out << "#include <android-base/macros.h>\n";
     out << "#include <cutils/trace.h>\n";
     out << "#include <future>\n";