Rename new_handler in tests to avoid conflicts with MSVC symbols.
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:
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
|
||||
};
|
||||
|
||||
void test_max_alloc() {
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
auto do_test = []() {
|
||||
void* vp = operator new [](std::numeric_limits<std::size_t>::max(),
|
||||
std::align_val_t(OverAligned),
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -38,7 +38,7 @@ struct A
|
||||
int main()
|
||||
{
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
try
|
||||
{
|
||||
void* volatile vp = operator new[] (std::numeric_limits<std::size_t>::max());
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -37,7 +37,7 @@ struct A
|
||||
|
||||
int main()
|
||||
{
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
try
|
||||
#endif
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -38,7 +38,7 @@ struct A
|
||||
int main()
|
||||
{
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
try
|
||||
{
|
||||
void* vp = operator new (std::numeric_limits<std::size_t>::max());
|
||||
|
||||
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -45,7 +45,7 @@ struct alignas(OverAligned) A
|
||||
|
||||
void test_throw_max_size() {
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
try
|
||||
{
|
||||
void* vp = operator new (std::numeric_limits<std::size_t>::max(),
|
||||
|
||||
@@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
|
||||
};
|
||||
|
||||
void test_max_alloc() {
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
auto do_test = []() {
|
||||
void* vp = operator new (std::numeric_limits<std::size_t>::max(),
|
||||
std::align_val_t(OverAligned),
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
int new_handler_called = 0;
|
||||
|
||||
void new_handler()
|
||||
void my_new_handler()
|
||||
{
|
||||
++new_handler_called;
|
||||
std::set_new_handler(0);
|
||||
@@ -37,7 +37,7 @@ struct A
|
||||
|
||||
int main()
|
||||
{
|
||||
std::set_new_handler(new_handler);
|
||||
std::set_new_handler(my_new_handler);
|
||||
#ifndef TEST_HAS_NO_EXCEPTIONS
|
||||
try
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user