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

Commit f48eaede authored Sep 12, 2022 by Ryan Prichard Committed by Automerger Merge Worker Sep 12, 2022

Merge "Remove use of std::unary_function and std::binary_function" am:...

Merge "Remove use of std::unary_function and std::binary_function" am: 021fbb28 am: fe6beef4 am: d2a70ba9

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

Change-Id: I298e4f428450b70304a1dcec294e0bd71698a731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b88ab0e6 d2a70ba9

system/gd/common/strings.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,13 +27,13 @@

		namespace {

		struct IsSpace : std::unary_function<std::string::value_type, bool> {
		struct IsSpace {
		bool operator()(std::string::value_type v) {
		return isspace(static_cast<int>(v));
		}
		};

		struct IsHexDigit : std::unary_function<std::string::value_type, bool> {
		struct IsHexDigit {
		bool operator()(std::string::value_type v) {
		return isxdigit(static_cast<int>(v));
		}

system/stack/include/a2dp_codec_api.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -436,8 +436,7 @@ class A2dpCodecs {
		void debug_codec_dump(int fd);

		private:
		struct CompareBtBdaddr
		: public std::binary_function<RawAddress, RawAddress, bool> {
		struct CompareBtBdaddr {
		bool operator()(const RawAddress& lhs, const RawAddress& rhs) const {
		return (memcmp(&lhs, &rhs, sizeof(lhs)) < 0);
		}