aboutsummaryrefslogtreecommitdiff
path: root/VectorType.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'VectorType.cpp')
-rw-r--r--VectorType.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/VectorType.cpp b/VectorType.cpp
index b3e72359..da09884b 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -368,6 +368,7 @@ void VectorType::emitResolveReferencesEmbeddedHelper(
CHECK(needsResolveReferences() && mElementType->needsResolveReferences());
const std::string nameDeref = name + (nameIsPointer ? "->" : ".");
+ const std::string nameDerefed = (nameIsPointer ? "*" : "") + name;
std::string elementType = mElementType->getCppStackType();
std::string myChildName = childName, myChildOffset = childOffsetText;
@@ -377,7 +378,8 @@ void VectorType::emitResolveReferencesEmbeddedHelper(
myChildOffset = "0";
out << "size_t " << myChildName << ";\n";
- out << "_hidl_err = " << nameDeref << "findInParcel("
+ out << "_hidl_err = ::android::hardware::findInParcel("
+ << nameDerefed << ", "
<< (parcelObjIsPointer ? "*" : "") << parcelObj << ", "
<< "&" << myChildName
<< ");\n";