Merge pull request #6818 from JonnyH/WIP/variant-update

Update mpark::variant implementation to 1.3.0
dolphin-emu · May 11, 2018 · b938e15 · b938e15
2 parents 2d6a0b8 + 791c840
commit b938e15
Show file tree

Hide file tree

Showing 2 changed files with 367 additions and 198 deletions.
diff --git a/Source/Core/Common/Compat/in_place.h b/Source/Core/Common/Compat/in_place.h
@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-namespace std
+namespace mpark
 {
 struct in_place_t
 {
@@ -32,12 +32,14 @@ struct in_place_type_t
   explicit in_place_type_t() = default;
 };
 
+#ifdef MPARK_VARIABLE_TEMPLATES
 constexpr in_place_t in_place{};
 
 template <std::size_t I>
 constexpr in_place_index_t<I> in_place_index{};
 
 template <typename T>
 constexpr in_place_type_t<T> in_place_type{};
+#endif
 
-}  // namespace std
+}  // namespace mpark