From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 9 May 2023 13:57:50 +0000 (+0200)
Subject: Use a static variable for empty_set, and allow default noexcept move constructor.
X-Git-Tag: v3.34~131^2~4
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f5a43baee1257ab9c2546fa83a24ed3ac0fc0d89

Use a static variable for empty_set, and allow default noexcept move constructor.
---

diff --git a/src/xbt/utils/iter/powerset.hpp b/src/xbt/utils/iter/powerset.hpp
index d7b2cdf3f5..b83bad77e6 100644
--- a/src/xbt/utils/iter/powerset.hpp
+++ b/src/xbt/utils/iter/powerset.hpp
@@ -40,8 +40,6 @@ private:
   std::optional<subsets_iterator<Iterator>> current_subset_iter     = std::nullopt;
   std::optional<subsets_iterator<Iterator>> current_subset_iter_end = std::nullopt;
 
-  const std::vector<Iterator> empty_subset = std::vector<Iterator>();
-
   // boost::iterator_facade<...> interface to implement
   void increment();
   bool equal(const powerset_iterator<Iterator>& other) const;
@@ -70,6 +68,7 @@ template <typename Iterator> const std::vector<Iterator>& powerset_iterator<Iter
   if (current_subset_iter.has_value()) {
     return *current_subset_iter.value();
   }
+  static const std::vector<Iterator> empty_subset;
   return empty_subset;
 }