LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename new_handler in tests to avoid conflicts with MSVC symbols.

Browse Source 
On Windows the header new.h defines "new_handler" in the global
namespace.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292177 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-01-17 00:32:08 +00:00
parent 7d24e9101d
commit ebb9839230
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp
View File

@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
}; };
void test_max_alloc() { void test_max_alloc() {
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
auto do_test = []() { auto do_test = []() {
void* vp = operator new [](std::numeric_limits<std::size_t>::max(), void* vp = operator new [](std::numeric_limits<std::size_t>::max(),
std::align_val_t(OverAligned), std::align_val_t(OverAligned),

4
test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
View File

@@ -21,7 +21,7 @@
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -38,7 +38,7 @@ struct A
int main() int main()
{ {
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
try try
{ {
void* volatile vp = operator new[] (std::numeric_limits<std::size_t>::max()); void* volatile vp = operator new[] (std::numeric_limits<std::size_t>::max());

4
test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
View File

@@ -21,7 +21,7 @@
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -37,7 +37,7 @@ struct A
int main() int main()
{ {
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
try try
#endif #endif

4
test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
View File

@@ -21,7 +21,7 @@
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -38,7 +38,7 @@ struct A
int main() int main()
{ {
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
try try
{ {
void* vp = operator new (std::numeric_limits<std::size_t>::max()); void* vp = operator new (std::numeric_limits<std::size_t>::max());

4
test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp
View File

@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -45,7 +45,7 @@ struct alignas(OverAligned) A
void test_throw_max_size() { void test_throw_max_size() {
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
try try
{ {
void* vp = operator new (std::numeric_limits<std::size_t>::max(), void* vp = operator new (std::numeric_limits<std::size_t>::max(),

4
test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp
View File

@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
}; };
void test_max_alloc() { void test_max_alloc() {
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
auto do_test = []() { auto do_test = []() {
void* vp = operator new (std::numeric_limits<std::size_t>::max(), void* vp = operator new (std::numeric_limits<std::size_t>::max(),
std::align_val_t(OverAligned), std::align_val_t(OverAligned),

4
test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
View File

@@ -21,7 +21,7 @@
int new_handler_called = 0; int new_handler_called = 0;
void new_handler() void my_new_handler()
{ {
++new_handler_called; ++new_handler_called;
std::set_new_handler(0); std::set_new_handler(0);
@@ -37,7 +37,7 @@ struct A
int main() int main()
{ {
std::set_new_handler(new_handler); std::set_new_handler(my_new_handler);
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
try try
#endif #endif