From f8c14ed8f08bc7896e678cd7225bfe281459b853 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Wed, 26 Oct 2022 13:22:08 -0400
Subject: [PATCH] include: Add [[nodiscard]] to make_scope_guard

To prevent a bug where an unassigned scope guard runs right away.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/include/scope_guard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/include/scope_guard.h b/src/include/scope_guard.h
index 878d8c169f5a..eacc65e7b671 100644
--- a/src/include/scope_guard.h
+++ b/src/include/scope_guard.h
@@ -35,11 +35,13 @@ struct scope_guard {
 };
 
 template <typename F>
+[[nodiscard("Unassigned scope guards will execute immediately")]]
 scope_guard<F> make_scope_guard(F &&f) {
   return scope_guard<F>(std::forward<F>(f));
 }
 
 template<typename F, typename... Args>
+[[nodiscard("Unassigned scope guards will execute immediately")]]
 scope_guard<F> make_scope_guard(std::in_place_type_t<F>, Args&& ...args) {
   return { std::in_place, std::forward<Args>(args)... };
 }
-- 
2.47.3