Skip to content

Commit 80ee303

Browse files
committed
Fix some CI issues
1 parent a501d16 commit 80ee303

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

libcxx/include/__hash_table

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <__memory/pointer_traits.h>
2727
#include <__memory/swap_allocator.h>
2828
#include <__memory/unique_ptr.h>
29+
#include <__new/launder.h>
2930
#include <__type_traits/can_extract_key.h>
3031
#include <__type_traits/conditional.h>
3132
#include <__type_traits/enable_if.h>
@@ -46,7 +47,6 @@
4647
#include <__utility/swap.h>
4748
#include <cstring>
4849
#include <limits>
49-
#include <new> // __launder
5050

5151
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
5252
# pragma GCC system_header

libcxx/test/std/language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc.pass.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
// test bad_alloc
1010

1111
#include <new>
12-
#include <type_traits>
1312
#include <cassert>
13+
#include <exception>
14+
#include <type_traits>
1415

1516
#include "test_macros.h"
1617

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <new>
1212
#include <cassert>
13+
#include <cstddef>
1314

1415
#include "test_macros.h"
1516

libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.verify.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ int main(int, char**)
2626
(void) std::launder(( void *) nullptr);
2727
(void) std::launder((const void *) nullptr);
2828
(void) std::launder(( volatile void *) nullptr);
29-
(void) std::launder((const volatile void *) nullptr); // expected-error-re@new:* 4 {{static assertion failed{{.*}}can't launder cv-void}}
30-
// expected-error@new:* 0-4 {{void pointer argument to '__builtin_launder' is not allowed}}
29+
(void) std::launder((const volatile void *) nullptr); // expected-error-re@*:* 4 {{static assertion failed{{.*}}can't launder cv-void}}
30+
// expected-error@*:* 0-4 {{void pointer argument to '__builtin_launder' is not allowed}}
3131

32-
(void) std::launder(foo); // expected-error-re@new:* 1 {{static assertion failed{{.*}}can't launder functions}}
33-
// expected-error@new:* 0-1 {{function pointer argument to '__builtin_launder' is not allowed}}
32+
(void) std::launder(foo); // expected-error-re@*:* 1 {{static assertion failed{{.*}}can't launder functions}}
33+
// expected-error@*:* 0-1 {{function pointer argument to '__builtin_launder' is not allowed}}
3434

3535
return 0;
3636
}

libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <memory>
1616
#include <cassert>
17+
#include <cstddef>
1718
#include <new>
1819

1920
#include "test_macros.h"

0 commit comments

Comments
 (0)