From ae7bad2ff8869a09bc95b407efbf0dab656c5fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 28 Dec 2016 10:14:08 +0100 Subject: [PATCH] Removed superfluous "namespace Catch" that caused build error No idea how it got here, likely a bad merge. This is why there needs to be Windows travis build, it would have caught this right away. --- include/internal/catch_fatal_condition.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/internal/catch_fatal_condition.hpp b/include/internal/catch_fatal_condition.hpp index 81f87ee1..100ffaa2 100644 --- a/include/internal/catch_fatal_condition.hpp +++ b/include/internal/catch_fatal_condition.hpp @@ -26,8 +26,6 @@ namespace Catch { #if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// -namespace Catch { - #define NOMINMAX #define WIN32_LEAN_AND_MEAN #include