Fix generated warnings in <variant>
llvm-svn: 288552
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: cb3ef1561de278ce8819c5a095092dbc2b0d00b2
diff --git a/include/variant b/include/variant
index f57d5ce..1207b59 100644
--- a/include/variant
+++ b/include/variant
@@ -453,7 +453,7 @@
static constexpr auto __make_farray(_Fs&&... __fs) {
__std_visit_visitor_return_type_check<decay_t<_Fs>...>();
using __result = array<common_type_t<decay_t<_Fs>...>, sizeof...(_Fs)>;
- return __result{_VSTD::forward<_Fs>(__fs)...};
+ return __result{{_VSTD::forward<_Fs>(__fs)...}};
}
template <class _Fp, class... _Vs, size_t... _Is>
@@ -645,13 +645,14 @@
public:
inline _LIBCPP_INLINE_VISIBILITY
explicit constexpr __base(__valueless_t tag) noexcept
- : __index(__variant_npos), __data(tag) {}
+ : __data(tag), __index(__variant_npos) {}
template <size_t _Ip, class... _Args>
inline _LIBCPP_INLINE_VISIBILITY
explicit constexpr __base(in_place_index_t<_Ip>, _Args&&... __args)
- : __index(_Ip),
- __data(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...) {}
+ :
+ __data(in_place_index<_Ip>, _VSTD::forward<_Args>(__args)...),
+ __index(_Ip) {}
inline _LIBCPP_INLINE_VISIBILITY
constexpr bool valueless_by_exception() const noexcept {