feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Complete disable CATCH_SFINAE for now

Browse Source
This commit is contained in:
Phil Nash
2013-04-20 23:18:44 +01:00
parent 003960dc90
commit 9fff9e47d3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_compiler_capabilities.h
View File

@@ -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

4
include/internal/catch_tostring.hpp
View File

@@ -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 ) {