Merge "Cleanup spaces in output."
diff --git a/Method.cpp b/Method.cpp
index dfac662..d9b2edb 100644
--- a/Method.cpp
+++ b/Method.cpp
@@ -129,7 +129,7 @@
out << name() << "_cb _hidl_cb";
}
- out << ") ";
+ out << ")";
}
// static
diff --git a/generateCpp.cpp b/generateCpp.cpp
index 95176f9..f834f78 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -901,7 +901,7 @@
const bool returnsValue = !method->results().empty();
const TypedVar *elidedReturn = method->canElideCallback();
- out << "{\n";
+ out << " {\n";
out.indent();
diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index caa0ac0..6b5888c 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -111,8 +111,8 @@
generateCppPackageInclude(out, mPackage, "I" + baseName);
- out << "#include <hidl/Status.h>\n\n";
out << "#include <hidl/MQDescriptor.h>\n";
+ out << "#include <hidl/Status.h>\n\n";
enterLeaveNamespace(out, true /* enter */);
out << "namespace implementation {\n\n";