commit | 8f3fee6216129d508c8c58b9c4e4fd72dff03b1f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 10 20:58:52 2020 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 10 20:58:52 2020 +0000 |
tree | 49b38f60a542a4ec8003fc12905959a6ac6d4e85 | |
parent | ce3f17e662f5c5e1b645a6e0bc64e8ac96a77716 [diff] | |
parent | 25cf3b5b9c76bcf17ec38b9878eca9ebd976e00d [diff] |
Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h index e3cbf2e..f2d3c13 100644 --- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h +++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h
@@ -206,7 +206,7 @@ InternalPool(VehiclePropertyType type, size_t vectorSize) : mPropType(type), mVectorSize(vectorSize) {} - RecyclableType obtain() { + RecyclableType obtain() override { return ObjectPool<VehiclePropValue>::obtain(); } protected: