commit | 45d6657f8f8803478e828c15ed64b0e5bdf266bd | [log] [tgz] |
---|---|---|
author | Ryan Prichard <rprichard@google.com> | Wed Jul 26 00:35:13 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 26 00:35:13 2023 +0000 |
tree | ccb9cce85b9dc570ef615ff86919342469538b80 | |
parent | bae1f6a06a2f9e61fd76910ef6d17c5c790ac724 [diff] | |
parent | afa3d1a2cfffa487258eb036f207f8c003e333f3 [diff] |
Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea am: 073c14a320 am: ce87f3a63d am: bc5e1931d8 am: afa3d1a2cf Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342 Change-Id: Iaf5083189f9d9faf5f97b07bafc56d59a2750b4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp index f3374c3..fc3a8b3 100644 --- a/compatibility_matrices/exclude/fcm_exclude.cpp +++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -14,6 +14,7 @@ * limitations under the License. */ +#include <functional> #include <string> #include <vector>
diff --git a/health/utils/libhealthloop/include/health/HealthLoop.h b/health/utils/libhealthloop/include/health/HealthLoop.h index 54b2740..fc3066e 100644 --- a/health/utils/libhealthloop/include/health/HealthLoop.h +++ b/health/utils/libhealthloop/include/health/HealthLoop.h
@@ -15,6 +15,7 @@ */ #pragma once +#include <functional> #include <memory> #include <mutex> #include <vector>