Variable templates are C++14, not C++17

STEllAR-GROUP · Jun 28, 2017 · 1919ad9 · 1919ad9
1 parent 00a9882
commit 1919ad9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -546,9 +546,9 @@ macro(hpx_check_for_cxx14_std_result_of_sfinae)
 endmacro()
 
 ###############################################################################
-macro(hpx_check_for_cxx17_variable_templates)
-  add_hpx_config_test(HPX_WITH_CXX17_VARIABLE_TEMPLATES
-    SOURCE cmake/tests/cxx17_variable_templates.cpp
+macro(hpx_check_for_cxx14_variable_templates)
+  add_hpx_config_test(HPX_WITH_CXX14_VARIABLE_TEMPLATES
+    SOURCE cmake/tests/cxx14_variable_templates.cpp
     FILE ${ARGN}
     CMAKECXXFEATURE cxx_variable_templates)
 endmacro()

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -154,6 +154,9 @@ macro(hpx_perform_cxx_feature_tests)
     hpx_check_for_cxx14_std_result_of_sfinae(
       DEFINITIONS HPX_HAVE_CXX14_STD_RESULT_OF_SFINAE)
 
+    hpx_check_for_cxx14_variable_templates(
+      DEFINITIONS HPX_HAVE_CXX14_VARIABLE_TEMPLATES)
+
     # check for experimental facilities
 
     # check for Library Fundamentals TS v2's experimental/optional
@@ -166,9 +169,6 @@ macro(hpx_perform_cxx_feature_tests)
     hpx_check_for_cxx17_fold_expressions(
         DEFINITIONS HPX_HAVE_CXX17_FOLD_EXPRESSIONS)
 
-    hpx_check_for_cxx17_variable_templates(
-      DEFINITIONS HPX_HAVE_CXX17_VARIABLE_TEMPLATES)
-
     hpx_check_for_cxx17_fallthrough_attribute(
       DEFINITIONS HPX_HAVE_CXX17_FALLTHROUGH_ATTRIBUTE)
   endif()

diff --git a/cmake/tests/cxx17_variable_templates.cpp → cmake/tests/cxx14_variable_templates.cpp b/cmake/tests/cxx17_variable_templates.cpp → cmake/tests/cxx14_variable_templates.cpp