maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC] Group aligned new/delete definitions together in new.cpp 

This patch is cleanup to prepare for future changes

llvm-svn: 292560
This commit is contained in:
Eric Fiselier 2017-01-20 01:13:49 +00:00
parent 90854c4ad0
commit 24a2ebe677
1 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
libcxx/src/new.cpp
View File

@ -63,6 +63,94 @@ operator new(std::size_t size) _THROW_BAD_ALLOC
return p; return p;
} }
_LIBCPP_WEAK
void*
operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
p = ::operator new(size);
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
}
#endif // _LIBCPP_NO_EXCEPTIONS
return p;
}
_LIBCPP_WEAK
void*
operator new[](size_t size) _THROW_BAD_ALLOC
{
return ::operator new(size);
}
_LIBCPP_WEAK
void*
operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
p = ::operator new[](size);
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
}
#endif // _LIBCPP_NO_EXCEPTIONS
return p;
}
_LIBCPP_WEAK
void
operator delete(void* ptr) _NOEXCEPT
{
if (ptr)
::free(ptr);
}
_LIBCPP_WEAK
void
operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK
void
operator delete(void* ptr, size_t) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK
void
operator delete[] (void* ptr) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK
void
operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete[](ptr);
}
_LIBCPP_WEAK
void
operator delete[] (void* ptr, size_t) _NOEXCEPT
{
::operator delete[](ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void * void *
operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC
@ -95,25 +183,6 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC
return p; return p;
} }
_LIBCPP_WEAK
void*
operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
p = ::operator new(size);
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
}
#endif // _LIBCPP_NO_EXCEPTIONS
return p;
}
_LIBCPP_WEAK _LIBCPP_WEAK
void* void*
operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT
@ -133,13 +202,6 @@ operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) _NO
return p; return p;
} }
_LIBCPP_WEAK
void*
operator new[](size_t size) _THROW_BAD_ALLOC
{
return ::operator new(size);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void* void*
operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC
@ -147,25 +209,6 @@ operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC
return ::operator new(size, alignment); return ::operator new(size, alignment);
} }
_LIBCPP_WEAK
void*
operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
p = ::operator new[](size);
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
}
#endif // _LIBCPP_NO_EXCEPTIONS
return p;
}
_LIBCPP_WEAK _LIBCPP_WEAK
void* void*
operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT
@ -185,14 +228,6 @@ operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) _
return p; return p;
} }
_LIBCPP_WEAK
void
operator delete(void* ptr) _NOEXCEPT
{
if (ptr)
::free(ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete(void* ptr, std::align_val_t) _NOEXCEPT operator delete(void* ptr, std::align_val_t) _NOEXCEPT
@ -205,13 +240,6 @@ operator delete(void* ptr, std::align_val_t) _NOEXCEPT
#endif #endif
} }
_LIBCPP_WEAK
void
operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT
@ -219,13 +247,6 @@ operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) _N
::operator delete(ptr, alignment); ::operator delete(ptr, alignment);
} }
_LIBCPP_WEAK
void
operator delete(void* ptr, size_t) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete(void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT operator delete(void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT
@ -233,13 +254,6 @@ operator delete(void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT
::operator delete(ptr, alignment); ::operator delete(ptr, alignment);
} }
_LIBCPP_WEAK
void
operator delete[] (void* ptr) _NOEXCEPT
{
::operator delete(ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete[] (void* ptr, std::align_val_t alignment) _NOEXCEPT operator delete[] (void* ptr, std::align_val_t alignment) _NOEXCEPT
@ -247,13 +261,6 @@ operator delete[] (void* ptr, std::align_val_t alignment) _NOEXCEPT
::operator delete(ptr, alignment); ::operator delete(ptr, alignment);
} }
_LIBCPP_WEAK
void
operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete[](ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete[] (void* ptr, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT operator delete[] (void* ptr, std::align_val_t alignment, const std::nothrow_t&) _NOEXCEPT
@ -261,13 +268,6 @@ operator delete[] (void* ptr, std::align_val_t alignment, const std::nothrow_t&)
::operator delete[](ptr, alignment); ::operator delete[](ptr, alignment);
} }
_LIBCPP_WEAK
void
operator delete[] (void* ptr, size_t) _NOEXCEPT
{
::operator delete[](ptr);
}
_LIBCPP_WEAK _LIBCPP_WEAK
void void
operator delete[] (void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT operator delete[] (void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT