| commit | 3e7bf33ef9ac7505c2560aed654be7e7366b42c8 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 10 21:55:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 10 21:55:05 2020 +0000 |
| tree | 49b38f60a542a4ec8003fc12905959a6ac6d4e85 | |
| parent | fac4d91948be4210b0a7b19d734d4cffffd30091 [diff] | |
| parent | d42b6f4315d2b98f117cc7e68cbe0739ce7da2eb [diff] |
Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev am: 8f3fee6216 am: cd8a78f7bd am: d42b6f4315 Change-Id: Ib9d41a2001ec6831cbd7e23dc81908dc32a041e7
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: