[libc++][NFC] Always define __non_trivially_copyable_base in pair.h

Only the actual inheritance needs to be guarded.
llvm · Feb 11, 2023 · ab17e1b · ab17e1b
1 parent a98936d
commit ab17e1b
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
@@ -49,15 +49,13 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if defined(_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR)
 template <class, class>
 struct __non_trivially_copyable_base {
   _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI
   __non_trivially_copyable_base() _NOEXCEPT {}
   _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI
   __non_trivially_copyable_base(__non_trivially_copyable_base const&) _NOEXCEPT {}
 };
-#endif
 
 template <class _T1, class _T2>
 struct _LIBCPP_TEMPLATE_VIS pair