Skip to content

Commit 185739a

Browse files
committed
[libc++][NFC] Use TEST_HAS_NO_FILESYSTEM_LIBRARY in the test suite
This replaces some uses of internal libc++ macros with the equivalent macro from "test_macros.h". Differential Revision: https://reviews.llvm.org/D151825
1 parent 86ab938 commit 185739a

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_bidirectional_iterator.compile.pass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// template<class I>
1515
// concept __iterator_traits_detail::__cpp17_bidirectional_iterator;
1616

17+
#include "test_macros.h"
18+
1719
#include <iterator>
1820

1921
#include <array>
2022
#include <deque>
21-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
23+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
2224
#include <filesystem>
2325
#endif
2426
#include <forward_list>
@@ -59,7 +61,7 @@ static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std:
5961
static_assert(std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::deque<int>::const_reverse_iterator>);
6062

6163
// <filesystem>
62-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
64+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
6365
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::directory_iterator>);
6466
static_assert(!std::__iterator_traits_detail::__cpp17_bidirectional_iterator<std::filesystem::recursive_directory_iterator>);
6567
#endif

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_forward_iterator.compile.pass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// template<class I>
1515
// concept __iterator_traits_detail::__cpp17_forward_iterator;
1616

17+
#include "test_macros.h"
18+
1719
#include <iterator>
1820

1921
#include <array>
2022
#include <deque>
21-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
23+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
2224
#include <filesystem>
2325
#endif
2426
#include <forward_list>
@@ -59,7 +61,7 @@ static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque
5961
static_assert(std::__iterator_traits_detail::__cpp17_forward_iterator<std::deque<int>::const_reverse_iterator>);
6062

6163
// <filesystem>
62-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
64+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
6365
static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::directory_iterator>);
6466
static_assert(!std::__iterator_traits_detail::__cpp17_forward_iterator<std::filesystem::recursive_directory_iterator>);
6567
#endif

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_input_iterator.compile.pass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// template<class I>
1515
// concept __iterator_traits_detail::__cpp17_input_iterator;
1616

17+
#include "test_macros.h"
18+
1719
#include <iterator>
1820

1921
#include <array>
2022
#include <deque>
21-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
23+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
2224
#include <filesystem>
2325
#endif
2426
#include <forward_list>
@@ -59,7 +61,7 @@ static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<i
5961
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::deque<int>::const_reverse_iterator>);
6062

6163
// <filesystem>
62-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
64+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
6365
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::directory_iterator>);
6466
static_assert(std::__iterator_traits_detail::__cpp17_input_iterator<std::filesystem::recursive_directory_iterator>);
6567
#endif

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_iterator.compile.pass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// template<class I>
1515
// concept __iterator_traits_detail::__cpp17_iterator;
1616

17+
#include "test_macros.h"
18+
1719
#include <iterator>
1820

1921
#include <array>
2022
#include <deque>
21-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
23+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
2224
#include <filesystem>
2325
#endif
2426
#include <forward_list>
@@ -59,7 +61,7 @@ static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::r
5961
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::deque<int>::const_reverse_iterator>);
6062

6163
// <filesystem>
62-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
64+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
6365
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::directory_iterator>);
6466
static_assert(std::__iterator_traits_detail::__cpp17_iterator<std::filesystem::recursive_directory_iterator>);
6567
#endif

libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_random_access_iterator.compile.pass.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
// template<class I>
1515
// concept __iterator_traits_detail::__cpp17_random_access_iterator;
1616

17+
#include "test_macros.h"
18+
1719
#include <iterator>
1820

1921
#include <array>
2022
#include <deque>
21-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
23+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
2224
#include <filesystem>
2325
#endif
2426
#include <forward_list>
@@ -59,7 +61,7 @@ static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std:
5961
static_assert(std::__iterator_traits_detail::__cpp17_random_access_iterator<std::deque<int>::const_reverse_iterator>);
6062

6163
// <filesystem>
62-
#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY
64+
#ifndef TEST_HAS_NO_FILESYSTEM_LIBRARY
6365
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::directory_iterator>);
6466
static_assert(!std::__iterator_traits_detail::__cpp17_random_access_iterator<std::filesystem::recursive_directory_iterator>);
6567
#endif

0 commit comments

Comments
 (0)