blob: d2146d09e560aad3365909a1bb665f3ec1282ee6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From abfe66bd28456752b8395b43a364f8f88610e5bf Mon Sep 17 00:00:00 2001
From: scarf <greenscarf005@gmail.com>
Date: Mon, 22 Jul 2024 02:33:30 +0900
Subject: [PATCH] build: fix some build errors on fedora (#4979)
* build: fix template-id-cdtor error on gcc 14
related: https://github.com/project-chip/connectedhomeip/issues/33493
* build: use explicit `std::replace` from `<algorithm>`
---
src/cata_arena.h | 8 ++++----
src/safe_reference.h | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/cata_arena.h b/src/cata_arena.h
index 7eeec9a0c01..c1aee051719 100644
--- a/src/cata_arena.h
+++ b/src/cata_arena.h
@@ -37,12 +37,12 @@ class cata_arena
return true;
}
- cata_arena<T>() = default;
- cata_arena<T>( const cata_arena<T> & ) = delete;
- cata_arena<T>( cata_arena<T> && ) = delete;
-
+ cata_arena() = default;
public:
+ cata_arena( const cata_arena<T> & ) = delete;
+ cata_arena( cata_arena<T> && ) = delete;
+
using value_type = T;
static void mark_for_destruction( T *alloc ) {
diff --git a/src/safe_reference.h b/src/safe_reference.h
index 552aeb6e300..201d0a9500e 100644
--- a/src/safe_reference.h
+++ b/src/safe_reference.h
@@ -48,6 +48,7 @@
*/
#include <memory>
+#include <algorithm>
#include <unordered_map>
#include "debug.h"
--
2.43.0
|
