From 67c364dd9b1d598679fd7ec6c4029b5045c827c1 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 27 Aug 2018 21:41:50 +0000 Subject: [PATCH] Fix ODR violation: namespace-scope helpers should not be declared 'static'. llvm-svn: 340778 --- libcxx/include/variant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/include/variant b/libcxx/include/variant index f9098f4..6c7dca2 100644 --- a/libcxx/include/variant +++ b/libcxx/include/variant @@ -1320,7 +1320,7 @@ constexpr bool holds_alternative(const variant<_Types...>& __v) noexcept { template inline _LIBCPP_INLINE_VISIBILITY -static constexpr auto&& __generic_get(_Vp&& __v) { +constexpr auto&& __generic_get(_Vp&& __v) { using __variant_detail::__access::__variant; if (!__holds_alternative<_Ip>(__v)) { __throw_bad_variant_access(); -- 2.7.4