Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 129f7108 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing <functional> header for std::function" into main am:... 

Merge "Add missing <functional> header for std::function" into main am: 138e470f am: 0ae6956a am: 9a811d4b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2673540



Change-Id: Ie9ba2da9df427988d99c5179756c1cdb0850334f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61fc635c 9a811d4b

Dns64Configuration.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <netinet/in.h>

#include <netinet/in.h>

#include <condition_variable>

#include <condition_variable>

#include <cstdlib>

#include <cstdlib>

#include <functional>

#include <mutex>

#include <mutex>

#include <unordered_map>

#include <unordered_map>

Experiments.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once

#pragma once





#include <climits>

#include <climits>

#include <functional>

#include <map>

#include <map>

#include <mutex>

#include <mutex>

#include <string>

#include <string>

tests/resolv_integration_test.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ 




#include <algorithm>

#include <algorithm>

#include <chrono>

#include <chrono>

#include <functional>

#include <iterator>

#include <iterator>

#include <numeric>

#include <numeric>

#include <string_view>

#include <string_view>

tests/resolv_test_utils.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <arpa/nameser.h>

#include <arpa/nameser.h>

#include <netdb.h>

#include <netdb.h>





#include <functional>

#include <string>

#include <string>

#include <vector>

#include <vector>