Skip to content

Commit 535c597

Browse files
committed
remove useless decl in align.h
1 parent 65e53c3 commit 535c597

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

libcxx/include/__memory/align.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
_LIBCPP_BEGIN_NAMESPACE_STD
2121

22-
__attribute__((always_inline)) inline void* __align_impl(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
22+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void*
23+
__align_impl(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
2324
void* __r = nullptr;
2425
if (__sz <= __space) {
2526
char* __p1 = static_cast<char*>(__ptr);
@@ -34,11 +35,7 @@ __attribute__((always_inline)) inline void* __align_impl(size_t __align, size_t
3435
return __r;
3536
}
3637

37-
#ifdef _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS
38-
39-
_LIBCPP_EXPORTED_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
40-
41-
#else
38+
#ifndef _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS
4239

4340
inline _LIBCPP_HIDE_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space) {
4441
return __align_impl(__align, __sz, __ptr, __space);

libcxx/src/memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ __sp_mut& __get_sp_mut(const void* p) {
135135

136136
#if defined(_LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS)
137137

138-
void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {
138+
_LIBCPP_EXPORTED_FROM_ABI void* align(size_t alignment, size_t size, void*& ptr, size_t& space) {
139139
return __align_impl(alignment, size, ptr, space);
140140
}
141141
#endif // _LIBCPP_ALIGN_DEFINE_LEGACY_INLINE_FUNCTIONS

0 commit comments

Comments
 (0)