Skip to content

Commit fa06bc2

Browse files
poor-circleldionne
andauthored
Apply suggestions from code review
Co-authored-by: Louis Dionne <[email protected]>
1 parent d10f929 commit fa06bc2

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

libcxx/docs/ReleaseNotes/22.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ ABI Affecting Changes
116116
potentially inheriting from the types they wrap. At this point in time we are not aware of any ABI changes caused by
117117
this.
118118

119-
- ``align`` has been removed from libc++ library in ABI v2. We also add a new ABI flag ``_LIBCPP_ABI_DO_NOT_EXPORT_ALIGN``.
119+
- ``std::align`` is now implemented as an inline function and its definition is removed from the
120+
libc++ built library in ABI v2, or when the ``_LIBCPP_ABI_DO_NOT_EXPORT_ALIGN`` ABI configuration is enabled..
120121

121122
Build System Changes
122123
--------------------

libcxx/include/__configuration/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
#endif
106106

107107
// The PE/COFF format reports a linking error when encountering multiple symbol definitions where at least one is a
108-
// strong symbol. So we can't inlining a non-inline function without ABI break change.
108+
// strong symbol. So we can't inline a function that also has a non-inline definition visible.
109109
#if defined(_LIBCPP_OBJECT_FORMAT_COFF)
110110
# define _LIBCPP_DISABLE_INLINE_OPTIMIZE_BECAUSE_MULTIPLY_SYMBOLS_ERROR
111111
#endif

libcxx/src/memory_align.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <__cstddef/size_t.h>
1111
#include <cstdint>
1212

13-
// Don't include <memory> to avoid mulitple declartion of align()
13+
// Don't include <memory> to avoid multiple declarations of std::align()
1414

1515
#if !defined(_LIBCPP_ABI_DO_NOT_EXPORT_ALIGN)
1616

0 commit comments

Comments
 (0)