From 9fff9e47d344317f8f2f0e82c505b40666b44b54 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Sat, 20 Apr 2013 23:18:44 +0100
Subject: [PATCH] Complete disable CATCH_SFINAE for now

---
 include/internal/catch_compiler_capabilities.h | 2 +-
 include/internal/catch_tostring.hpp            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h
index 7d0d7a3d..e2486a3d 100644
--- a/include/internal/catch_compiler_capabilities.h
+++ b/include/internal/catch_compiler_capabilities.h
@@ -52,7 +52,7 @@
 
 #elif __GNUC__ >= 3
 
-#define CATCH_SFINAE
+// #define CATCH_SFINAE // Taking this out completely for now
 
 #endif // __GNUC__ < 3
 
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index 739dd851..e751816e 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -22,6 +22,9 @@
 namespace Catch {
 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
 
     template<typename T>
@@ -81,7 +84,6 @@ template<typename T>
 struct StringMaker :
     Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
 
-
 template<typename T>
 struct StringMaker<T*> {
     static std::string convert( T const* p ) {