aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-05-20 18:04:16 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-10-01 20:36:53 +0100
commitdc1b29508d765b874372f4b1737ac6dc86962506 (patch)
treeb1acb735a83e744ee45db840c82c467a27887051
parent59ffa3e3dba5a7805585c61dd4387c5644249d52 (diff)
downloadgcc-dc1b29508d765b874372f4b1737ac6dc86962506.zip
gcc-dc1b29508d765b874372f4b1737ac6dc86962506.tar.gz
gcc-dc1b29508d765b874372f4b1737ac6dc86962506.tar.bz2
libstdc++: Fix narrowing conversion in std::visit
Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: * include/std/variant (__do_visit): Use variant_npos instead of literal -1 that requires a narrowing conversion.
-rw-r--r--libstdc++-v3/include/std/variant3
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index ddeefd9..d50c6b7 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -1830,7 +1830,8 @@ namespace __variant
if constexpr (is_same_v<_Result_type, __variant_idx_cookie>
|| is_same_v<_Result_type, __variant_cookie>)
{
- return __gen_vtable_impl<_Ma, index_sequence<-1>>::
+ using _Npos = index_sequence<variant_npos>;
+ return __gen_vtable_impl<_Ma, _Npos>::
__visit_invoke(std::forward<_Visitor>(__visitor),
std::forward<_V0>(__v0));
}