Skip to content

Commit 35757d6

Browse files
authored
Revert "[libc++] Re-enable std::pair trivial copy constructor for FreeBSD >= 14" (#142204)
The ABI bump to adopt the conforming ABI v1 std::pair implementation did not end up happening for FreeBSD 14, and instead this diff was reverted downstream in FreeBSD[1]. Align the upstream ABI config with FreeBSD's actual ABI. [1] ce4f1f49e036 ("Revert commit 6255157 from llvm-project (by Dimitry Andric):") This reverts commit 6255157.
1 parent d6a2ca3 commit 35757d6

File tree

2 files changed

+2
-2
lines changed
  • libcxx/include

2 files changed

+2
-2
lines changed

libcxx/include/__configuration/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
# endif
131131
// Feature macros for disabling pre ABI v1 features. All of these options
132132
// are deprecated.
133-
# if defined(__FreeBSD__) && __FreeBSD__ < 14
133+
# if defined(__FreeBSD__)
134134
# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
135135
# endif
136136
#endif

libcxx/include/__cxx03/__configuration/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
# endif
117117
// Feature macros for disabling pre ABI v1 features. All of these options
118118
// are deprecated.
119-
# if defined(__FreeBSD__) && __FreeBSD__ < 14
119+
# if defined(__FreeBSD__)
120120
# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
121121
# endif
122122
#endif

0 commit comments

Comments
 (0)