Skip to content

Commit e6ed1e5

Browse files
committed
ci
1 parent 4600ee7 commit e6ed1e5

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

libcxx/include/__flat_map/flat_map.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class flat_map {
161161
: __key_iter_(std::move(__key_iter)), __mapped_iter_(std::move(__mapped_iter)) {}
162162

163163
_LIBCPP_HIDE_FROM_ABI __reference operator*() const { return __reference(*__key_iter_, *__mapped_iter_); }
164-
_LIBCPP_HIDE_FROM_ABI __arrow_proxy operator->() const { return __arrow_proxy(**this); }
164+
_LIBCPP_HIDE_FROM_ABI __arrow_proxy operator->() const { return __arrow_proxy{**this}; }
165165

166166
_LIBCPP_HIDE_FROM_ABI __iterator& operator++() {
167167
++__key_iter_;

libcxx/test/libcxx/containers/containers.adaptors/flat.map/assert.sorted_unique.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// REQUIRES: has-unix-headers
99
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
1010
// UNSUPPORTED: libcpp-hardening-mode=none
11+
// REQUIRES: libcpp-hardening-mode=debug
1112
// XFAIL: libcpp-hardening-mode=debug && availability-verbose_abort-missing
1213

1314
// <flat_map>

libcxx/test/std/containers/container.adaptors/flat.map.syn/sorted_unique.pass.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@ constexpr bool test() {
3939
int main(int, char**) {
4040
test();
4141
static_assert(test());
42+
43+
return 0;
4244
}

libcxx/test/std/containers/container.adaptors/flat.map/flat.map.operations/equal_range_transparent.pass.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// template<class K> pair<const_iterator,const_iterator> equal_range(const K& x) const;
1515

1616
#include <cassert>
17+
#include <deque>
1718
#include <flat_map>
1819
#include <string>
1920
#include <utility>

libcxx/test/std/containers/container.adaptors/flat.map/helpers.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
#include "test_allocator.h"
1919
#include "test_macros.h"
20-
#include "check_assertion.h"
20+
#if !defined(TEST_HAS_NO_LOCALIZATION)
21+
# include "check_assertion.h"
22+
#endif
2123

2224
template <class... Args>
2325
void check_invariant(const std::flat_map<Args...>& m) {
@@ -176,7 +178,7 @@ struct ThrowOnMoveContainer : std::vector<T> {
176178
#endif
177179

178180
template <class F>
179-
void test_emplace_exception_guarantee(F&& emplace_function) {
181+
void test_emplace_exception_guarantee([[maybe_unused]] F&& emplace_function) {
180182
#ifndef TEST_HAS_NO_EXCEPTIONS
181183
using C = TransparentComparator;
182184
{
@@ -300,7 +302,7 @@ void test_emplace_exception_guarantee(F&& emplace_function) {
300302
}
301303

302304
template <class F>
303-
void test_insert_range_exception_guarantee(F&& insert_function) {
305+
void test_insert_range_exception_guarantee([[maybe_unused]] F&& insert_function) {
304306
#ifndef TEST_HAS_NO_EXCEPTIONS
305307
using KeyContainer = EmplaceUnsafeContainer<int>;
306308
using ValueContainer = std::vector<int>;
@@ -324,7 +326,7 @@ void test_insert_range_exception_guarantee(F&& insert_function) {
324326
}
325327

326328
template <class F>
327-
void test_erase_exception_guarantee(F&& erase_function) {
329+
void test_erase_exception_guarantee([[maybe_unused]] F&& erase_function) {
328330
#ifndef TEST_HAS_NO_EXCEPTIONS
329331
{
330332
// key erase throws
@@ -366,8 +368,8 @@ void test_erase_exception_guarantee(F&& erase_function) {
366368
}
367369

368370
template <class F>
369-
void test_swap_exception_guarantee(F&& swap_function) {
370-
#ifndef TEST_HAS_NO_EXCEPTIONS
371+
void test_swap_exception_guarantee([[maybe_unused]] F&& swap_function) {
372+
#if !defined(TEST_HAS_NO_EXCEPTIONS) && !defined(TEST_HAS_NO_LOCALIZATION)
371373
{
372374
// key swap throws
373375
using KeyContainer = ThrowOnMoveContainer<int>;

0 commit comments

Comments
 (0)