luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a SFINAE check that keeps surfacing msvc bugs, fixes #215

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-20 21:07:04 -06:00
parent 34ea9572b8
commit 3aa080d536
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/utils/utils.hpp
View File

@ -201,16 +201,11 @@ namespace detail {
// Also allow file_wrapper file = std::fopen(object_path.c_str(), "rb"); // Also allow file_wrapper file = std::fopen(object_path.c_str(), "rb");
template< template<
typename T, typename T,
typename D typename D,
// workaround for: // Note: Previously checked if D was invocable and returned void but this kept causing problems for MSVC
// == 19.38-specific msvc bug https://developercommunity.visualstudio.com/t/MSVC-1938331290-preview-fails-to-comp/10505565 // == 19.38-specific msvc bug https://developercommunity.visualstudio.com/t/MSVC-1938331290-preview-fails-to-comp/10505565
// <= 19.23 msvc also appears to fail (but for a different reason https://godbolt.org/z/6Y5EvdWPK) // <= 19.23 msvc also appears to fail (but for a different reason https://godbolt.org/z/6Y5EvdWPK)
#if !defined(_MSC_VER) || !(_MSC_VER <= 1923 || _MSC_VER == 1938) // <= 19.39 msvc also has trouble with it for different reasons https://godbolt.org/z/aPPPT7z3z
,
typename std::enable_if<
std::is_same<decltype(std::declval<D>()(std::declval<T>())), void>::value,
int
>::type = 0,
typename std::enable_if< typename std::enable_if<
std::is_standard_layout<T>::value && std::is_trivial<T>::value, std::is_standard_layout<T>::value && std::is_trivial<T>::value,
int int
@ -219,7 +214,6 @@ namespace detail {
std::is_nothrow_move_constructible<T>::value, std::is_nothrow_move_constructible<T>::value,
int int
>::type = 0 >::type = 0
#endif
> >
class raii_wrapper { class raii_wrapper {
T obj; T obj;
@ -251,22 +245,7 @@ namespace detail {
} }
}; };
template< template<typename T, typename D>
typename T,
typename D
// workaround a msvc bug https://developercommunity.visualstudio.com/t/MSVC-1938331290-preview-fails-to-comp/10505565
#if !defined(_MSC_VER) || _MSC_VER != 1938
,
typename std::enable_if<
std::is_same<decltype(std::declval<D>()(std::declval<T>())), void>::value,
int
>::type = 0,
typename std::enable_if<
std::is_standard_layout<T>::value && std::is_trivial<T>::value,
int
>::type = 0
#endif
>
raii_wrapper<typename std::remove_reference<T>::type, D> raii_wrap(T obj, D deleter) { raii_wrapper<typename std::remove_reference<T>::type, D> raii_wrap(T obj, D deleter) {
return raii_wrapper<typename std::remove_reference<T>::type, D>(obj, deleter); return raii_wrapper<typename std::remove_reference<T>::type, D>(obj, deleter);
} }
@ -298,6 +277,32 @@ namespace detail {
return *ptr; return *ptr;
} }
}; };
// template<typename F>
// class scope_guard {
// F f;
// bool active;
// public:
// scope_guard(F&& f) : f(std::forward<F>(f)), active(true) {}
// ~scope_guard() {
// if(active) {
// f();
// }
// }
// scope_guard(const scope_guard&) = delete;
// scope_guard(scope_guard&& other) : f(std::move(other.f)), active(exchange(other.active, false)) {}
// scope_guard& operator=(const scope_guard&) = delete;
// scope_guard& operator=(scope_guard&& other) {
// f = std::move(other.f);
// active = exchange(other.active, false);
// return *this;
// }
// };
// template<typename F>
// auto scope_exit(F&& f) {
// return scope_guard<F>(std::forward<F>(f));
// }
} }
} }