From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 19 Jan 2022 15:24:11 +0000 (+0000)
Subject: common: fix FTBFS due to dout & need_dynamic on GCC-12
X-Git-Tag: v18.0.0~1388^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=963d756ded40f5adf2efef53893c917bec1845c1;p=ceph-ci.git

common: fix FTBFS due to dout & need_dynamic on GCC-12

For details see:
https://gist.github.com/rzarzynski/d6d2df6888923bef6a3e764f4856853f.

Special thanks to Kaleb Keithley who reported the issue
and tested the fix!

Fixes: https://tracker.ceph.com/issues/53896
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/common/dout.h b/src/common/dout.h
index 421222d535f..a1375fbb910 100644
--- a/src/common/dout.h
+++ b/src/common/dout.h
@@ -99,11 +99,12 @@ namespace ceph::dout {
 template<typename T>
 struct dynamic_marker_t {
   T value;
-  operator T() const { return value; }
+  // constexpr ctor isn't needed as it's an aggregate type
+  constexpr operator T() const { return value; }
 };
 
 template<typename T>
-dynamic_marker_t<T> need_dynamic(T&& t) {
+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
   return dynamic_marker_t<T>{ std::forward<T>(t) };
 }