[libcxx-commits] [libcxx] ab17e1b - [libc++][NFC] Always define __non_trivially_copyable_base in pair.h

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2023-02-11T09:18:04-08:00
New Revision: ab17e1b76cf75f080b020a17e5983c3ea4f6e09a

URL: https://github.com/llvm/llvm-project/commit/ab17e1b76cf75f080b020a17e5983c3ea4f6e09a
DIFF: https://github.com/llvm/llvm-project/commit/ab17e1b76cf75f080b020a17e5983c3ea4f6e09a.diff

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

Only the actual inheritance needs to be guarded.

Added: 
    

Modified: 
    libcxx/include/__utility/pair.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
index 3ff71bf9aa17..69f21582fb7b 100644
--- a/libcxx/include/__utility/pair.h
+++ b/libcxx/include/__utility/pair.h
@@ -49,7 +49,6 @@
 
 _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
@@ -57,7 +56,6 @@ struct __non_trivially_copyable_base {
   _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