mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-30 01:03:30 +01:00
Complete disable CATCH_SFINAE for now
This commit is contained in:
parent
003960dc90
commit
9fff9e47d3
@ -52,7 +52,7 @@
|
|||||||
|
|
||||||
#elif __GNUC__ >= 3
|
#elif __GNUC__ >= 3
|
||||||
|
|
||||||
#define CATCH_SFINAE
|
// #define CATCH_SFINAE // Taking this out completely for now
|
||||||
|
|
||||||
#endif // __GNUC__ < 3
|
#endif // __GNUC__ < 3
|
||||||
|
|
||||||
|
@ -22,6 +22,9 @@
|
|||||||
namespace Catch {
|
namespace Catch {
|
||||||
namespace Detail {
|
namespace Detail {
|
||||||
|
|
||||||
|
// SFINAE is currently disabled by default for all compilers.
|
||||||
|
// If the non SFINAE version of IsStreamInsertable is ambiguous for you
|
||||||
|
// and your compiler supports SFINAE, try #defining CATCH_SFINAE
|
||||||
#ifdef CATCH_SFINAE
|
#ifdef CATCH_SFINAE
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
@ -81,7 +84,6 @@ template<typename T>
|
|||||||
struct StringMaker :
|
struct StringMaker :
|
||||||
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
|
Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
|
||||||
|
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
struct StringMaker<T*> {
|
struct StringMaker<T*> {
|
||||||
static std::string convert( T const* p ) {
|
static std::string convert( T const* p ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user