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