C++1z/17, fix MinGW GCC 6 ICE

windoze · Aug 15, 2016 · 0a78f9a · 0a78f9a
1 parent d15eb4c
commit 0a78f9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ option(WITH_MYSQL "Build MySQL library" ON)
 OPTION(WITH_CASSANDRA "Build Cassandra library" ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -ftemplate-depth=256")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z -ftemplate-depth=256")
 if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-deprecated-register -Wno-macro-redefined")
     set(CMAKE_LINK_FLAGS "${CMAKE_LINK_FLAGS} -stdlib=libc++")

diff --git a/include/fibio/utility.hpp b/include/fibio/utility.hpp
@@ -71,8 +71,8 @@ struct make_tuple_indices
     typedef typename make_indices_imp<Sp, tuple_indices<>, Ep>::type type;
 };
 
-#if defined(_WIN32) && (_MSC_VER >= 1900)
-// Visual C++ 2015 supports C++17 std::invoke
+#if (defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1900)) || defined(__cpp_lib_invoke)
+// Uses std::invoke when available, Visual C++ 2015 supports std::invoke but not feature test macros
 using std::invoke;
 #else