commit 7d3ac806f3f8e9ac3fe5ecc3d17054e8b4e641df
author Zhuoyao Zhang <zhuoyao@google.com> Wed Feb 15 21:05:49 2017 +0000
committer Zhuoyao Zhang <zhuoyao@google.com> Wed Feb 15 21:05:49 2017 +0000
tree ba0776e0bb7c7693abc4ca988a4f6834659bbeba
parent 7f12d6b336f105d4aa8ab3302f43c4d4efa40037

Revert "Revert "Move HidlInstrumentor to HidlInternal and namespace details.""

This reverts commit 7f12d6b336f105d4aa8ab3302f43c4d4efa40037.

Change-Id: Icbae613d1ec1a54492f6ac25815be6495264e9ee

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 727db26..a088960 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -775,7 +775,7 @@
         << klassName;
     if (iface->isIBase()) {
         out << " : public ::android::hardware::BHwBinder";
-        out << ", public ::android::hardware::HidlInstrumentor {\n";
+        out << ", public ::android::hardware::details::HidlInstrumentor {\n";
     } else {
         out << " : public "
             << gIBaseFqName.getInterfaceStubFqName().cppName()
@@ -886,7 +886,7 @@
         << proxyName
         << " : public ::android::hardware::BpInterface<"
         << iface->localName()
-        << ">, public ::android::hardware::HidlInstrumentor {\n";
+        << ">, public ::android::hardware::details::HidlInstrumentor {\n";
 
     out.indent();
 
@@ -1355,7 +1355,7 @@
         << "<"
         << fqName.getInterfaceName()
         << ">(_hidl_impl),\n"
-        << "  ::android::hardware::HidlInstrumentor(\""
+        << "  ::android::hardware::details::HidlInstrumentor(\""
         << mPackage.string()
         << "\", \""
         << fqName.getInterfaceName()
@@ -1387,7 +1387,7 @@
     out.indent();
 
     if (iface->isIBase()) {
-        out << ": ::android::hardware::HidlInstrumentor(\"";
+        out << ": ::android::hardware::details::HidlInstrumentor(\"";
     } else {
         out << ": "
             << gIBaseFqName.getInterfaceStubFqName().cppName()
@@ -1419,7 +1419,7 @@
         out.indent();
         out.indent();
 
-        out << ": ::android::hardware::HidlInstrumentor("
+        out << ": ::android::hardware::details::HidlInstrumentor("
             << "HidlInstrumentor_package, HidlInstrumentor_interface) {\n";
         out.indent();
         out << "_hidl_mImpl = _hidl_impl;\n";
@@ -1806,7 +1806,7 @@
     out << "struct "
         << klassName
         << " : " << ifaceName
-        << ", ::android::hardware::HidlInstrumentor {\n";
+        << ", ::android::hardware::details::HidlInstrumentor {\n";
 
     out.indent();
     out << "explicit "
@@ -1897,7 +1897,7 @@
         << klassName
         << "(const ::android::sp<"
         << iface->fullName()
-        << "> impl) : ::android::hardware::HidlInstrumentor(\""
+        << "> impl) : ::android::hardware::details::HidlInstrumentor(\""
         << mPackage.string()
         << "\", \""
         << iface->localName()