Skip to content

Commit e6d8883

Browse files
committed
Update vendor
1 parent 3cd9e50 commit e6d8883

File tree

1 file changed

+27
-15
lines changed
  • tests/vendor/cget/pkg/boost-ext__ut/install/include/boost

1 file changed

+27
-15
lines changed

tests/vendor/cget/pkg/boost-ext__ut/install/include/boost/ut.hpp

+27-15
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ export import std;
1919
#endif
2020

2121
#include <version>
22+
#if defined(_MSC_VER)
23+
#pragma push_macro("min")
24+
#pragma push_macro("max")
25+
#undef min
26+
#undef max
27+
#endif
2228
// Before libc++ 17 had experimental support for format and it required a
2329
// special build flag. Currently libc++ has not implemented all C++20 chrono
2430
// improvements. Therefore doesn't define __cpp_lib_format, instead query the
@@ -51,7 +57,7 @@ export import std;
5157
#elif not defined(__cpp_static_assert)
5258
#error "[Boost::ext].UT requires support for static assert";
5359
#else
54-
#define BOOST_UT_VERSION 2'0'0
60+
#define BOOST_UT_VERSION 2'0'1
5561

5662
#if defined(__has_builtin) and defined(__GNUC__) and (__GNUC__ < 10) and \
5763
not defined(__clang__)
@@ -103,7 +109,7 @@ struct _unique_name_for_auto_detect_prefix_and_suffix_lenght_0123456789_struct {
103109
};
104110

105111
BOOST_UT_EXPORT
106-
namespace boost::inline ext::ut::inline v2_0_0 {
112+
namespace boost::inline ext::ut::inline v2_0_1 {
107113
namespace utility {
108114
template <class>
109115
class function;
@@ -467,7 +473,7 @@ constexpr auto is_valid(...) -> bool {
467473
}
468474

469475
template <class T>
470-
inline constexpr auto is_container_v =
476+
inline constexpr auto is_range_v =
471477
is_valid<T>([](auto t) -> decltype(t.begin(), t.end(), void()) {});
472478

473479
template <class T>
@@ -1345,7 +1351,7 @@ class printer {
13451351

13461352
template <class T,
13471353
type_traits::requires_t<not type_traits::has_user_print<T> and
1348-
type_traits::is_container_v<T>> = 0>
1354+
type_traits::is_range_v<T>> = 0>
13491355
auto& operator<<(T&& t) {
13501356
*this << '{';
13511357
auto first = true;
@@ -2606,12 +2612,12 @@ namespace operators {
26062612
return detail::neq_{lhs, rhs};
26072613
}
26082614

2609-
template <class T, type_traits::requires_t<type_traits::is_container_v<T>> = 0>
2615+
template <class T, type_traits::requires_t<type_traits::is_range_v<T>> = 0>
26102616
[[nodiscard]] constexpr auto operator==(T&& lhs, T&& rhs) {
26112617
return detail::eq_{static_cast<T&&>(lhs), static_cast<T&&>(rhs)};
26122618
}
26132619

2614-
template <class T, type_traits::requires_t<type_traits::is_container_v<T>> = 0>
2620+
template <class T, type_traits::requires_t<type_traits::is_range_v<T>> = 0>
26152621
[[nodiscard]] constexpr auto operator!=(T&& lhs, T&& rhs) {
26162622
return detail::neq_{static_cast<T&&>(lhs), static_cast<T&&>(rhs)};
26172623
}
@@ -2704,23 +2710,24 @@ template <class Test>
27042710
}
27052711

27062712
template <class F, class T,
2707-
type_traits::requires_t<type_traits::is_container_v<T>> = 0>
2713+
type_traits::requires_t<type_traits::is_range_v<T>> = 0>
27082714
[[nodiscard]] constexpr auto operator|(const F& f, const T& t) {
27092715
return [f, t](const auto name) {
27102716
for (const auto& arg : t) {
2711-
detail::on<F>(events::test<F, typename T::value_type>{.type = "test",
2712-
.name = name,
2713-
.tag = {},
2714-
.location = {},
2715-
.arg = arg,
2716-
.run = f});
2717+
detail::on<F>(events::test<F, decltype(arg)>{
2718+
.type = "test",
2719+
.name = name,
2720+
.tag = {},
2721+
.location = {},
2722+
.arg = arg,
2723+
.run = f});
27172724
}
27182725
};
27192726
}
27202727

27212728
template <
27222729
class F, template <class...> class T, class... Ts,
2723-
type_traits::requires_t<not type_traits::is_container_v<T<Ts...>>> = 0>
2730+
type_traits::requires_t<not type_traits::is_range_v<T<Ts...>>> = 0>
27242731
[[nodiscard]] constexpr auto operator|(const F& f, const T<Ts...>& t) {
27252732
return [f, t](const auto name) {
27262733
apply(
@@ -3269,7 +3276,7 @@ using operators::operator not;
32693276
using operators::operator|;
32703277
using operators::operator/;
32713278
using operators::operator>>;
3272-
} // namespace boost::inline ext::ut::inline v2_0_0
3279+
} // namespace boost::inline ext::ut::inline v2_0_1
32733280

32743281
#if (defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)) && \
32753282
!defined(__EMSCRIPTEN__)
@@ -3282,4 +3289,9 @@ __attribute__((constructor)) inline void cmd_line_args(int argc,
32823289
// For MSVC, largc/largv are initialized with __argc/__argv
32833290
#endif
32843291

3292+
#if defined(_MSC_VER)
3293+
#pragma pop_macro("min")
3294+
#pragma pop_macro("max")
3295+
#endif
3296+
32853297
#endif

0 commit comments

Comments
 (0)