Fix build error: exception specification of explicitly

[simgrid.git] / src / xbt / utils / iter / iterator_wrapping.hpp

diff --git a/src/xbt/utils/iter/iterator_wrapping.hpp b/src/xbt/utils/iter/iterator_wrapping.hpp
index e4a4ea95c7962b8330f326f6058a859328f93b59..6e44299e85ff6ab1b0ea18b8a0b4a3de2cd0527f 100644 (file)
--- a/src/xbt/utils/iter/iterator_wrapping.hpp
+++ b/src/xbt/utils/iter/iterator_wrapping.hpp
@@ -40,15 +40,15 @@ template <typename T> using ref_or_value_t = typename ref_or_value<T>::type;
 template <typename Iterator, typename... Args> struct iterator_wrapping {
 private:
   std::tuple<ref_or_value_t<Args>...> m_args;
-  iterator_wrapping(Args&&... begin_iteration) : m_args(std::forward<ref_or_value_t<Args>>(begin_iteration)...) {}
 
   template <typename IteratorType, typename... Arguments>
-  friend iterator_wrapping<IteratorType, Arguments...> make_iterator_wrapping(Arguments&&... args);
+  friend constexpr iterator_wrapping<IteratorType, Arguments...> make_iterator_wrapping(Arguments&&... args);
 
   template <typename IteratorType, typename... Arguments>
-  friend iterator_wrapping<IteratorType, Arguments...> make_iterator_wrapping_explicit(Arguments... args);
+  friend constexpr iterator_wrapping<IteratorType, Arguments...> make_iterator_wrapping_explicit(Arguments... args);
 
 public:
+  iterator_wrapping(Args&&... begin_iteration) : m_args(ref_or_value_t<Args>(begin_iteration)...) {}
   iterator_wrapping(const iterator_wrapping&)            = delete;
   iterator_wrapping(iterator_wrapping&&)                 = delete;
   iterator_wrapping& operator=(const iterator_wrapping&) = delete;
@@ -62,15 +62,15 @@ public:
 };
 
 template <typename Iterator, typename... Args>
-iterator_wrapping<Iterator, Args...> make_iterator_wrapping(Args&&... args)
+constexpr iterator_wrapping<Iterator, Args...> make_iterator_wrapping(Args&&... args)
 {
   return iterator_wrapping<Iterator, Args...>(std::forward<Args>(args)...);
 }
 
 template <typename Iterator, typename... Args>
-iterator_wrapping<Iterator, Args...> make_iterator_wrapping_explicit(Args... args)
+constexpr iterator_wrapping<Iterator, Args...> make_iterator_wrapping_explicit(Args... args)
 {
-  return iterator_wrapping<Iterator, Args...>(std::forward<Args>(args)...);
+  return iterator_wrapping<Iterator, Args...>(args...);
 }
 
 } // namespace simgrid::xbt