Merge changes Icfaa316b,Ic26706d7 into main

* changes:
  Add missing libc++ includes
  No need to modify acc for std::accumulate
This commit is contained in:
Treehugger Robot
2024-01-09 22:23:55 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 4 deletions

View File

@@ -244,15 +244,15 @@ ndk::ScopedAStatus AudioControl::onDevicesToMuteChange(
template <typename aidl_type>
static inline std::string toString(const std::vector<aidl_type>& in_values) {
return std::accumulate(std::begin(in_values), std::end(in_values), std::string{},
[](std::string& ls, const aidl_type& rs) {
return ls += (ls.empty() ? "" : ",") + rs.toString();
[](const std::string& ls, const aidl_type& rs) {
return ls + (ls.empty() ? "" : ",") + rs.toString();
});
}
template <typename aidl_enum_type>
static inline std::string toEnumString(const std::vector<aidl_enum_type>& in_values) {
return std::accumulate(std::begin(in_values), std::end(in_values), std::string{},
[](std::string& ls, const aidl_enum_type& rs) {
return ls += (ls.empty() ? "" : ",") + toString(rs);
[](const std::string& ls, const aidl_enum_type& rs) {
return ls + (ls.empty() ? "" : ",") + toString(rs);
});
}

View File

@@ -18,6 +18,7 @@
#include <libnl++/Socket.h>
#include <atomic>
#include <mutex>
#include <thread>