summaryrefslogtreecommitdiffstats
path: root/recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch')
-rw-r--r--recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch b/recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch
deleted file mode 100644
index d119bf1b..00000000
--- a/recipes-extended/ceph/ceph/0002-common-fix-FTBFS-due-to-dout-need_dynamic-on-GCC-12.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 841806de212226921eeaeb3eea054bda8ccce616 Mon Sep 17 00:00:00 2001
2From: Radoslaw Zarzynski <rzarzyns@redhat.com>
3Date: Wed, 19 Jan 2022 15:24:11 +0000
4Subject: [PATCH 2/2] common: fix FTBFS due to dout & need_dynamic on GCC-12
5
6For details see:
7https://gist.github.com/rzarzynski/d6d2df6888923bef6a3e764f4856853f.
8
9Special thanks to Kaleb Keithley who reported the issue
10and tested the fix!
11
12Fixes: https://tracker.ceph.com/issues/53896
13Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
14
15Upstream-Status: Backport [963d756ded40f5adf2efef53893c917bec1845c1]
16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17---
18 src/common/dout.h | 5 +++--
19 1 file changed, 3 insertions(+), 2 deletions(-)
20
21diff --git a/src/common/dout.h b/src/common/dout.h
22index c7c08182..42f49915 100644
23--- a/src/common/dout.h
24+++ b/src/common/dout.h
25@@ -99,11 +99,12 @@ namespace ceph::dout {
26 template<typename T>
27 struct dynamic_marker_t {
28 T value;
29- operator T() const { return value; }
30+ // constexpr ctor isn't needed as it's an aggregate type
31+ constexpr operator T() const { return value; }
32 };
33
34 template<typename T>
35-dynamic_marker_t<T> need_dynamic(T&& t) {
36+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
37 return dynamic_marker_t<T>{ std::forward<T>(t) };
38 }
39
40--
412.36.0
42