Skip to content

Commit ca0e501

Browse files
committed
Rename new_handler in tests to avoid conflicts with MSVC symbols.
On Windows the header new.h defines "new_handler" in the global namespace. llvm-svn: 292177
1 parent b948b4d commit ca0e501

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
2929

3030
int new_handler_called = 0;
3131

32-
void new_handler()
32+
void my_new_handler()
3333
{
3434
++new_handler_called;
3535
std::set_new_handler(0);
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
4444
};
4545

4646
void test_max_alloc() {
47-
std::set_new_handler(new_handler);
47+
std::set_new_handler(my_new_handler);
4848
auto do_test = []() {
4949
void* vp = operator new [](std::numeric_limits<std::size_t>::max(),
5050
std::align_val_t(OverAligned),

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
int new_handler_called = 0;
2323

24-
void new_handler()
24+
void my_new_handler()
2525
{
2626
++new_handler_called;
2727
std::set_new_handler(0);
@@ -38,7 +38,7 @@ struct A
3838
int main()
3939
{
4040
#ifndef TEST_HAS_NO_EXCEPTIONS
41-
std::set_new_handler(new_handler);
41+
std::set_new_handler(my_new_handler);
4242
try
4343
{
4444
void* volatile vp = operator new[] (std::numeric_limits<std::size_t>::max());

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
int new_handler_called = 0;
2323

24-
void new_handler()
24+
void my_new_handler()
2525
{
2626
++new_handler_called;
2727
std::set_new_handler(0);
@@ -37,7 +37,7 @@ struct A
3737

3838
int main()
3939
{
40-
std::set_new_handler(new_handler);
40+
std::set_new_handler(my_new_handler);
4141
#ifndef TEST_HAS_NO_EXCEPTIONS
4242
try
4343
#endif

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
int new_handler_called = 0;
2323

24-
void new_handler()
24+
void my_new_handler()
2525
{
2626
++new_handler_called;
2727
std::set_new_handler(0);
@@ -38,7 +38,7 @@ struct A
3838
int main()
3939
{
4040
#ifndef TEST_HAS_NO_EXCEPTIONS
41-
std::set_new_handler(new_handler);
41+
std::set_new_handler(my_new_handler);
4242
try
4343
{
4444
void* vp = operator new (std::numeric_limits<std::size_t>::max());

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
2929

3030
int new_handler_called = 0;
3131

32-
void new_handler()
32+
void my_new_handler()
3333
{
3434
++new_handler_called;
3535
std::set_new_handler(0);
@@ -45,7 +45,7 @@ struct alignas(OverAligned) A
4545

4646
void test_throw_max_size() {
4747
#ifndef TEST_HAS_NO_EXCEPTIONS
48-
std::set_new_handler(new_handler);
48+
std::set_new_handler(my_new_handler);
4949
try
5050
{
5151
void* vp = operator new (std::numeric_limits<std::size_t>::max(),

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
2929

3030
int new_handler_called = 0;
3131

32-
void new_handler()
32+
void my_new_handler()
3333
{
3434
++new_handler_called;
3535
std::set_new_handler(0);
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
4444
};
4545

4646
void test_max_alloc() {
47-
std::set_new_handler(new_handler);
47+
std::set_new_handler(my_new_handler);
4848
auto do_test = []() {
4949
void* vp = operator new (std::numeric_limits<std::size_t>::max(),
5050
std::align_val_t(OverAligned),

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
int new_handler_called = 0;
2323

24-
void new_handler()
24+
void my_new_handler()
2525
{
2626
++new_handler_called;
2727
std::set_new_handler(0);
@@ -37,7 +37,7 @@ struct A
3737

3838
int main()
3939
{
40-
std::set_new_handler(new_handler);
40+
std::set_new_handler(my_new_handler);
4141
#ifndef TEST_HAS_NO_EXCEPTIONS
4242
try
4343
#endif

0 commit comments

Comments
 (0)