fixed test for visual c++

8 years ago · 859b7f1d58
parent 49989e0678
commit 859b7f1d58
2 changed files with 2 additions and 7 deletions
--- a/tests/file_log.cpp
+++ b/tests/file_log.cpp
@ -215,10 +215,9 @@ TEST_CASE("rotating_file_sink::calc_filename3", "[rotating_file_sink]]")



-
-
 // regex supported only from gcc 4.9 and above
-#if !(__GNUC__ <= 4 && __GNUC_MINOR__ < 9)
+#if defined (_MSC_VER) || !(__GNUC__ <= 4 && __GNUC_MINOR__ < 9)
+#include <regex>
 TEST_CASE("daily_file_sink::default_daily_file_name_calculator1", "[daily_file_sink]]")
 {
    // daily_YYYY-MM-DD_hh-mm.txt
--- a/tests/includes.h
+++ b/tests/includes.h
@ -6,10 +6,6 @@
 #include <ostream>
 #include <chrono>
 #include <exception>
-// regex supported only from gcc 4.9 and above
-#if !(__GNUC__ <= 4 && __GNUC_MINOR__ < 9)
-#include <regex>
-#endif
 #include "catch.hpp"
 #include "utils.h"