generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use _LIBCPP_NEW_DELETE_VIS instead of LIBCPP_FUNC_VIS in src/new.cpp.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192071 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-10-06 20:53:24 +00:00
parent 2bcdf5e9a0
commit 35a98a00b3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/new
View File

@ -138,8 +138,6 @@ _LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz, const std::nothrow
_LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p) _NOEXCEPT; _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p) _NOEXCEPT;
_LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT; _LIBCPP_NEW_DELETE_VIS void operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
#undef _LIBCPP_NEW_DELETE_VIS
inline _LIBCPP_INLINE_VISIBILITY void* operator new (std::size_t, void* __p) _NOEXCEPT {return __p;} inline _LIBCPP_INLINE_VISIBILITY void* operator new (std::size_t, void* __p) _NOEXCEPT {return __p;}
inline _LIBCPP_INLINE_VISIBILITY void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;} inline _LIBCPP_INLINE_VISIBILITY void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
inline _LIBCPP_INLINE_VISIBILITY void operator delete (void*, void*) _NOEXCEPT {} inline _LIBCPP_INLINE_VISIBILITY void operator delete (void*, void*) _NOEXCEPT {}

16
src/new.cpp
View File

@ -39,7 +39,7 @@
// in this shared library, so that they can be overriden by programs // in this shared library, so that they can be overriden by programs
// that define non-weak copies of the functions. // that define non-weak copies of the functions.
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void * void *
operator new(std::size_t size) operator new(std::size_t size)
#if !__has_feature(cxx_noexcept) #if !__has_feature(cxx_noexcept)
@ -66,7 +66,7 @@ operator new(std::size_t size)
return p; return p;
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void* void*
operator new(size_t size, const std::nothrow_t&) _NOEXCEPT operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
{ {
@ -85,7 +85,7 @@ operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
return p; return p;
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void* void*
operator new[](size_t size) operator new[](size_t size)
#if !__has_feature(cxx_noexcept) #if !__has_feature(cxx_noexcept)
@ -95,7 +95,7 @@ operator new[](size_t size)
return ::operator new(size); return ::operator new(size);
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void* void*
operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
{ {
@ -114,7 +114,7 @@ operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
return p; return p;
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void void
operator delete(void* ptr) _NOEXCEPT operator delete(void* ptr) _NOEXCEPT
{ {
@ -122,21 +122,21 @@ operator delete(void* ptr) _NOEXCEPT
::free(ptr); ::free(ptr);
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void void
operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT
{ {
::operator delete(ptr); ::operator delete(ptr);
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void void
operator delete[] (void* ptr) _NOEXCEPT operator delete[] (void* ptr) _NOEXCEPT
{ {
::operator delete (ptr); ::operator delete (ptr);
} }
_LIBCPP_WEAK _LIBCPP_FUNC_VIS _LIBCPP_WEAK _LIBCPP_NEW_DELETE_VIS
void void
operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
{ {