commit | 073c14a32033a6372e41ee17cc2eef9502f27304 | [log] [tgz] |
---|---|---|
author | Ryan Prichard <rprichard@google.com> | Tue Jul 25 21:27:25 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 25 21:27:25 2023 +0000 |
tree | 42ce5340e0832c61e138feb3f785d68a995234c8 | |
parent | 24d182487c3b15bf7f9462c21cc31a82b45501ad [diff] | |
parent | e5896f0feaed0665b20103a9ebc7e3651ce92c95 [diff] |
Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342 Change-Id: I3bff9b1908b006069248ebc3e9f9ad7793222e3b 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 b17c0e2..ccce449 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>