mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-25 15:19:42 -06:00
Merge pull request #6818 from JonnyH/WIP/variant-update
Update mpark::variant implementation to 1.3.0
This commit is contained in:
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|
||||||
namespace std
|
namespace mpark
|
||||||
{
|
{
|
||||||
struct in_place_t
|
struct in_place_t
|
||||||
{
|
{
|
||||||
@ -32,6 +32,7 @@ struct in_place_type_t
|
|||||||
explicit in_place_type_t() = default;
|
explicit in_place_type_t() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef MPARK_VARIABLE_TEMPLATES
|
||||||
constexpr in_place_t in_place{};
|
constexpr in_place_t in_place{};
|
||||||
|
|
||||||
template <std::size_t I>
|
template <std::size_t I>
|
||||||
@ -39,5 +40,6 @@ constexpr in_place_index_t<I> in_place_index{};
|
|||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
constexpr in_place_type_t<T> in_place_type{};
|
constexpr in_place_type_t<T> in_place_type{};
|
||||||
|
#endif
|
||||||
|
|
||||||
} // namespace std
|
} // namespace mpark
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user