Improve detection for integer_sequence

uilianries · Jan 25, 2018 · 2f82a50 · 2f82a50
1 parent 887bba8
commit 2f82a50
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/include/tao/seq/config.hpp b/include/tao/seq/config.hpp
@@ -1,22 +1,26 @@
-// Copyright (c) 2015-2017 Daniel Frey
+// Copyright (c) 2015-2018 Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/sequences/
 
 #ifndef TAOCPP_SEQUENCES_INCLUDE_CONFIG_HPP
 #define TAOCPP_SEQUENCES_INCLUDE_CONFIG_HPP
 
-#if __cplusplus >= 201402L
+#include <utility>
 
+#ifndef TAOCPP_USE_STD_INTEGER_SEQUENCE
+#if defined( __cpp_lib_integer_sequence ) || ( defined( _LIBCPP_VERSION ) && ( __cplusplus >= 201402L ) )
 #define TAOCPP_USE_STD_INTEGER_SEQUENCE
+#endif
+#endif
 
-#if defined( _LIBCPP_VERSION )
+#ifndef TAOCPP_USE_STD_MAKE_INTEGER_SEQUENCE
+#if defined( _LIBCPP_VERSION ) && ( __cplusplus >= 201402L )
 #define TAOCPP_USE_STD_MAKE_INTEGER_SEQUENCE
-#elif defined( _GLIBCXX_RELEASE ) && ( _GLIBCXX_RELEASE >= 8 )
+#elif defined( _GLIBCXX_RELEASE ) && ( _GLIBCXX_RELEASE >= 8 ) && ( __cplusplus >= 201402L )
 #define TAOCPP_USE_STD_MAKE_INTEGER_SEQUENCE
-#elif defined( _MSC_VER ) && ( _MSC_VER >= 190023918 )
+#elif defined( _MSC_VER ) && ( _MSC_FULL_VER >= 190023918 )
 #define TAOCPP_USE_STD_MAKE_INTEGER_SEQUENCE
 #endif
-
-#endif  // __cplusplus >= 201402L
+#endif
 
 #if defined( __cpp_fold_expressions )
 #define TAOCPP_FOLD_EXPRESSIONS