From 077097ec94d3318ca21681cc93f913f941d7f697 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 17 Apr 2025 18:43:25 +0200 Subject: fix it only where it's broken --- .../monero/0017-fix-unary_function-__unary_function.patch | 15 +++++++++------ .../0018-fix-unary_function-__unary_function.patch | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/patches/monero/0017-fix-unary_function-__unary_function.patch b/patches/monero/0017-fix-unary_function-__unary_function.patch index 78f7487..22e5275 100644 --- a/patches/monero/0017-fix-unary_function-__unary_function.patch +++ b/patches/monero/0017-fix-unary_function-__unary_function.patch @@ -1,22 +1,25 @@ -From 8bbaab4a476e1c15eb97761181f8eadab2e7ca8c Mon Sep 17 00:00:00 2001 +From 0a3a2df040e177b5741706e0a0c76fac585f0356 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 10 Apr 2025 13:28:05 +0200 Subject: [PATCH] fix: unary_function -> __unary_function --- - src/cryptonote_basic/cryptonote_basic_impl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/cryptonote_basic/cryptonote_basic_impl.h | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/src/cryptonote_basic/cryptonote_basic_impl.h b/src/cryptonote_basic/cryptonote_basic_impl.h -index b423573..3858be3 100644 +index b423573..a9aef7a 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.h +++ b/src/cryptonote_basic/cryptonote_basic_impl.h -@@ -40,7 +40,7 @@ namespace cryptonote { +@@ -40,7 +40,11 @@ namespace cryptonote { /* */ /************************************************************************/ template -- struct array_hasher: std::unary_function ++#ifdef __APPLE__ + struct array_hasher: std::__unary_function ++#else + struct array_hasher: std::unary_function ++#endif { std::size_t operator()(const t_array& val) const { diff --git a/patches/wownero/0018-fix-unary_function-__unary_function.patch b/patches/wownero/0018-fix-unary_function-__unary_function.patch index 6e97146..5fc385c 100644 --- a/patches/wownero/0018-fix-unary_function-__unary_function.patch +++ b/patches/wownero/0018-fix-unary_function-__unary_function.patch @@ -1,22 +1,25 @@ -From b0d3cdc6d8a0089db64a0c0403e295c85b86f2fa Mon Sep 17 00:00:00 2001 +From e488eaa7397d388cee6e914e10d23790f005f6f7 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 10 Apr 2025 13:28:06 +0200 Subject: [PATCH] fix: unary_function -> __unary_function --- - src/cryptonote_basic/cryptonote_basic_impl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/cryptonote_basic/cryptonote_basic_impl.h | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/src/cryptonote_basic/cryptonote_basic_impl.h b/src/cryptonote_basic/cryptonote_basic_impl.h -index b423573..3858be3 100644 +index b423573..a9aef7a 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.h +++ b/src/cryptonote_basic/cryptonote_basic_impl.h -@@ -40,7 +40,7 @@ namespace cryptonote { +@@ -40,7 +40,11 @@ namespace cryptonote { /* */ /************************************************************************/ template -- struct array_hasher: std::unary_function ++#ifdef __APPLE__ + struct array_hasher: std::__unary_function ++#else + struct array_hasher: std::unary_function ++#endif { std::size_t operator()(const t_array& val) const { -- cgit v1.2.3