Remove noexcept clauses from visit methods

ecmwf · Aug 9, 2024 · 897bd4a · 897bd4a
1 parent 0f0ab46
commit 897bd4a
Showing 1 changed file with 3 additions and 22 deletions.
diff --git a/src/multio/message/MetadataValue.h b/src/multio/message/MetadataValue.h
@@ -54,37 +54,18 @@ class MetadataValue : public MetadataValueVariant {
     //
     // Static cast to base class is done because gcc had a bug with visiting derived classes:
     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90943 Not required for gcc12
-#if defined(__GNUC__) && (__GNUC__ < 9)
     template <typename F>
-    decltype(auto) visit(F&& f) const&
-#else
-    template <typename F>
-    decltype(auto) visit(F&& f) const& noexcept(noexcept(util::visitUnwrapUniquePtr(std::forward<F>(f), *this)))
-#endif
-    {
+    decltype(auto) visit(F&& f) const& {
         return util::visitUnwrapUniquePtr(std::forward<F>(f), *this);
     }
 
-#if defined(__GNUC__) && (__GNUC__ < 9)
-    template <typename F>
-    decltype(auto) visit(F&& f) &
-#else
     template <typename F>
-    decltype(auto) visit(F&& f) & noexcept(noexcept(util::visitUnwrapUniquePtr(std::forward<F>(f), *this)))
-#endif
-    {
+    decltype(auto) visit(F&& f) & {
         return util::visitUnwrapUniquePtr(std::forward<F>(f), *this);
     }
 
-#if defined(__GNUC__) && (__GNUC__ < 9)
-    template <typename F>
-    decltype(auto) visit(F&& f) &&
-#else
     template <typename F>
-    decltype(auto) visit(F&& f) && noexcept(noexcept(util::visitUnwrapUniquePtr(std::forward<F>(f),
-                                                                                std::move(*this))))
-#endif
-    {
+    decltype(auto) visit(F&& f) && {
         return util::visitUnwrapUniquePtr(std::forward<F>(f), std::move(*this));
     }