File tree Expand file tree Collapse file tree 7 files changed +14
-14
lines changed
libcxx/test/std/language.support/support.dynamic/new.delete Expand file tree Collapse file tree 7 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
29
29
30
30
int new_handler_called = 0 ;
31
31
32
- void new_handler ()
32
+ void my_new_handler ()
33
33
{
34
34
++new_handler_called;
35
35
std::set_new_handler (0 );
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
44
44
};
45
45
46
46
void test_max_alloc () {
47
- std::set_new_handler (new_handler );
47
+ std::set_new_handler (my_new_handler );
48
48
auto do_test = []() {
49
49
void * vp = operator new [](std::numeric_limits<std::size_t >::max (),
50
50
std::align_val_t (OverAligned),
Original file line number Diff line number Diff line change 21
21
22
22
int new_handler_called = 0 ;
23
23
24
- void new_handler ()
24
+ void my_new_handler ()
25
25
{
26
26
++new_handler_called;
27
27
std::set_new_handler (0 );
@@ -38,7 +38,7 @@ struct A
38
38
int main ()
39
39
{
40
40
#ifndef TEST_HAS_NO_EXCEPTIONS
41
- std::set_new_handler (new_handler );
41
+ std::set_new_handler (my_new_handler );
42
42
try
43
43
{
44
44
void * volatile vp = operator new [] (std::numeric_limits<std::size_t >::max ());
Original file line number Diff line number Diff line change 21
21
22
22
int new_handler_called = 0 ;
23
23
24
- void new_handler ()
24
+ void my_new_handler ()
25
25
{
26
26
++new_handler_called;
27
27
std::set_new_handler (0 );
@@ -37,7 +37,7 @@ struct A
37
37
38
38
int main ()
39
39
{
40
- std::set_new_handler (new_handler );
40
+ std::set_new_handler (my_new_handler );
41
41
#ifndef TEST_HAS_NO_EXCEPTIONS
42
42
try
43
43
#endif
Original file line number Diff line number Diff line change 21
21
22
22
int new_handler_called = 0 ;
23
23
24
- void new_handler ()
24
+ void my_new_handler ()
25
25
{
26
26
++new_handler_called;
27
27
std::set_new_handler (0 );
@@ -38,7 +38,7 @@ struct A
38
38
int main ()
39
39
{
40
40
#ifndef TEST_HAS_NO_EXCEPTIONS
41
- std::set_new_handler (new_handler );
41
+ std::set_new_handler (my_new_handler );
42
42
try
43
43
{
44
44
void * vp = operator new (std::numeric_limits<std::size_t >::max ());
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
29
29
30
30
int new_handler_called = 0 ;
31
31
32
- void new_handler ()
32
+ void my_new_handler ()
33
33
{
34
34
++new_handler_called;
35
35
std::set_new_handler (0 );
@@ -45,7 +45,7 @@ struct alignas(OverAligned) A
45
45
46
46
void test_throw_max_size () {
47
47
#ifndef TEST_HAS_NO_EXCEPTIONS
48
- std::set_new_handler (new_handler );
48
+ std::set_new_handler (my_new_handler );
49
49
try
50
50
{
51
51
void * vp = operator new (std::numeric_limits<std::size_t >::max (),
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ constexpr auto OverAligned = alignof(std::max_align_t) * 2;
29
29
30
30
int new_handler_called = 0 ;
31
31
32
- void new_handler ()
32
+ void my_new_handler ()
33
33
{
34
34
++new_handler_called;
35
35
std::set_new_handler (0 );
@@ -44,7 +44,7 @@ struct alignas(OverAligned) A
44
44
};
45
45
46
46
void test_max_alloc () {
47
- std::set_new_handler (new_handler );
47
+ std::set_new_handler (my_new_handler );
48
48
auto do_test = []() {
49
49
void * vp = operator new (std::numeric_limits<std::size_t >::max (),
50
50
std::align_val_t (OverAligned),
Original file line number Diff line number Diff line change 21
21
22
22
int new_handler_called = 0 ;
23
23
24
- void new_handler ()
24
+ void my_new_handler ()
25
25
{
26
26
++new_handler_called;
27
27
std::set_new_handler (0 );
@@ -37,7 +37,7 @@ struct A
37
37
38
38
int main ()
39
39
{
40
- std::set_new_handler (new_handler );
40
+ std::set_new_handler (my_new_handler );
41
41
#ifndef TEST_HAS_NO_EXCEPTIONS
42
42
try
43
43
#endif
You can’t perform that action at this time.
0 commit comments