Changed the way noexcept support is handled to (hopefully) fix #275 and #273

include/internal/catch_compiler_capabilities.h

@@ -12,11 +12,13 @@
 
 #ifdef __clang__
 
-#if __has_feature(cxx_nullptr)
+#  if __has_feature(cxx_nullptr)
+#    define CATCH_CONFIG_CPP11_NULLPTR
+#  endif
 
-#define CATCH_CONFIG_CPP11_NULLPTR
-
-#endif
+#  if __has_feature(cxx_noexcept)
+#    define CATCH_CONFIG_CPP11_NOEXCEPT
+#  endif
 
 #endif // __clang__
 
@@ -108,13 +110,10 @@
 #endif
 
 // noexcept support:
-#ifdef CATCH_CPP11_OR_GREATER
-#  if (__has_feature(cxx_noexcept))
-#    define CATCH_NOEXCEPT noexcept
-#    define CATCH_NOEXCEPT_IS(x) noexcept(x)
-#  endif
-#endif
-#ifndef CATCH_NO_EXCEPT
+#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT)
+#  define CATCH_NOEXCEPT noexcept
+#  define CATCH_NOEXCEPT_IS(x) noexcept(x)
+#else
 #  define CATCH_NOEXCEPT throw()
 #  define CATCH_NOEXCEPT_IS(x)
 #endif

include/internal/catch_evaluate.hpp

@@ -13,6 +13,8 @@
 #pragma warning(disable:4389) // '==' : signed/unsigned mismatch
 #endif
 
+#include <cstddef>
+
 namespace Catch {
 namespace Internal {
 

include/internal/catch_tostring.h

@@ -15,6 +15,7 @@
 #include <iomanip>
 #include <limits>
 #include <vector>
+#include <cstddef>
 
 #ifdef __OBJC__
 #include "catch_objc_arc.hpp"