Noexcept lambdas

morzhovets · Sep 8, 2024 · 7779fc9 · 7779fc9
1 parent 796d410
commit 7779fc9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/include/momo/Utility.h b/include/momo/Utility.h
@@ -355,7 +355,8 @@ class FastMovableFunctor
 
 	template<typename... Args>
 	decltype(auto) operator()(Args&&... args) &&
-		noexcept(noexcept(std::forward<BaseFunctor>(mBaseFunctor)(std::forward<Args>(args)...)))
+		noexcept(std::is_nothrow_invocable_v<BaseFunctor&&, Args&&...>)
+		//noexcept(noexcept(std::forward<BaseFunctor>(mBaseFunctor)(std::forward<Args>(args)...)))	// gcc 11
 	{
 		return std::forward<BaseFunctor>(mBaseFunctor)(std::forward<Args>(args)...);
 	}
@@ -391,7 +392,8 @@ class FastCopyableFunctor
 
 	template<typename... Args>
 	decltype(auto) operator()(Args&&... args) const
-		noexcept(noexcept(mBaseFunctor(std::forward<Args>(args)...)))
+		noexcept(std::is_nothrow_invocable_v<const BaseFunctor&, Args&&...>)
+		//noexcept(noexcept(mBaseFunctor(std::forward<Args>(args)...)))	// gcc 11
 	{
 		return mBaseFunctor(std::forward<Args>(args)...);
 	}