diff --git a/src/entt/core/compressed_pair.hpp b/src/entt/core/compressed_pair.hpp index 45b3e4f84..57a9e7871 100644 --- a/src/entt/core/compressed_pair.hpp +++ b/src/entt/core/compressed_pair.hpp @@ -24,12 +24,12 @@ struct compressed_pair_element { requires std::default_initializable {} template - constexpr compressed_pair_element(Arg &&arg) noexcept(std::is_nothrow_constructible_v) + constexpr compressed_pair_element(Arg &&arg) noexcept(stl::is_nothrow_constructible_v) requires (!std::same_as, compressed_pair_element>) : value{stl::forward(arg)} {} template - constexpr compressed_pair_element(stl::tuple args, std::index_sequence) noexcept(std::is_nothrow_constructible_v) + constexpr compressed_pair_element(stl::tuple args, std::index_sequence) noexcept(stl::is_nothrow_constructible_v) : value{stl::forward(std::get(args))...} {} [[nodiscard]] constexpr reference get() noexcept { @@ -56,12 +56,12 @@ struct compressed_pair_element: Type { : base_type{} {} template - constexpr compressed_pair_element(Arg &&arg) noexcept(std::is_nothrow_constructible_v) + constexpr compressed_pair_element(Arg &&arg) noexcept(stl::is_nothrow_constructible_v) requires (!std::same_as, compressed_pair_element>) : base_type{stl::forward(arg)} {} template - constexpr compressed_pair_element(stl::tuple args, std::index_sequence) noexcept(std::is_nothrow_constructible_v) + constexpr compressed_pair_element(stl::tuple args, std::index_sequence) noexcept(stl::is_nothrow_constructible_v) : base_type{stl::forward(std::get(args))...} {} [[nodiscard]] constexpr reference get() noexcept { @@ -129,7 +129,7 @@ public: * @param other Value to use to initialize the second element. */ template - constexpr compressed_pair(Arg &&arg, Other &&other) noexcept(std::is_nothrow_constructible_v && std::is_nothrow_constructible_v) + constexpr compressed_pair(Arg &&arg, Other &&other) noexcept(stl::is_nothrow_constructible_v && stl::is_nothrow_constructible_v) : first_base{stl::forward(arg)}, second_base{stl::forward(other)} {} @@ -141,7 +141,7 @@ public: * @param other Arguments to use to initialize the second element. */ template - constexpr compressed_pair(std::piecewise_construct_t, stl::tuple args, stl::tuple other) noexcept(std::is_nothrow_constructible_v && std::is_nothrow_constructible_v) + constexpr compressed_pair(std::piecewise_construct_t, stl::tuple args, stl::tuple other) noexcept(stl::is_nothrow_constructible_v && stl::is_nothrow_constructible_v) : first_base{stl::move(args), std::index_sequence_for{}}, second_base{stl::move(other), std::index_sequence_for{}} {} diff --git a/src/entt/core/tuple.hpp b/src/entt/core/tuple.hpp index b41cfe94d..8b6f12577 100644 --- a/src/entt/core/tuple.hpp +++ b/src/entt/core/tuple.hpp @@ -57,7 +57,7 @@ struct forward_apply: private Func { * @param args Parameters to use to construct the instance. */ template - constexpr forward_apply(Args &&...args) noexcept(std::is_nothrow_constructible_v) + constexpr forward_apply(Args &&...args) noexcept(stl::is_nothrow_constructible_v) : Func{stl::forward(args)...} {} /** diff --git a/src/entt/stl/type_traits.hpp b/src/entt/stl/type_traits.hpp index 187bf5092..baad09f9e 100644 --- a/src/entt/stl/type_traits.hpp +++ b/src/entt/stl/type_traits.hpp @@ -22,6 +22,7 @@ using std::is_invocable_r_v; using std::is_lvalue_reference_v; using std::is_member_object_pointer_v; using std::is_move_assignable_v; +using std::is_nothrow_constructible_v; using std::is_nothrow_move_constructible_v; using std::is_pointer_v; using std::is_same_v;