3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-08 23:29:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation failure when using libstdc++10 (#1929)

Browse Source 
The issue is caused by deleted `std::__detail::begin` declared in `bits/iterator_concepts.h`. This would be found by ADL, and because it is deleted, compilation would fail. This change makes it so that we SFINAE on `begin(std::declval<T>())` and `end(std::declval<T>())` being well-formed.
This commit is contained in:
Natsu 2020-05-15 17:30:12 +08:00 committed by GitHub
parent b1dcdc5032
commit c190061001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/internal/catch_tostring.h
View File

@ -469,20 +469,27 @@ namespace Catch {
#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER #endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
namespace Catch { namespace Catch {
struct not_this_one {}; // Tag type for detecting which begin/ end are being selected // Import begin/ end from std here
// Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
using std::begin; using std::begin;
using std::end; using std::end;
not_this_one begin( ... ); namespace detail {
not_this_one end( ... ); template <typename...>
struct void_type {
using type = void;
};
template <typename T, typename = void>
struct is_range_impl : std::false_type {
};
template <typename T> template <typename T>
struct is_range { struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
static const bool value = };
!std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value && } // namespace detail
!std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
template <typename T>
struct is_range : detail::is_range_impl<T> {
}; };
#if defined(_MANAGED) // Managed types are never ranges #if defined(_MANAGED) // Managed types are never ranges