From a9db482aaa19f04c560b9ceada8983d51aeb42f8 Mon Sep 17 00:00:00 2001 From: Florent Hivert Date: Sat, 28 Oct 2023 20:10:58 +0100 Subject: [PATCH] constexpr backward compat cleanup in build files --- CMakeLists.txt | 18 +++++++++--------- config.h.in | 9 --------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6531bab5..cec744ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,15 +53,15 @@ include(CheckCXXSourceCompiles) include(CheckCXXCompilerFlag) ## Check for buggy constexpr support G++ 5.0 -check_cxx_source_compiles( - " - using T = int; - constexpr int exec(T f()) { return f(); } - constexpr int foo() { return 1; } - static_assert(exec(foo) == 1, \"Failed exec\"); - int main() {} - " - HPCOMBI_CONSTEXPR_FUN_ARGS) +# check_cxx_source_compiles( +# " +# using T = int; +# constexpr int exec(T f()) { return f(); } +# constexpr int foo() { return 1; } +# static_assert(exec(foo) == 1, \"Failed exec\"); +# int main() {} +# " +# HPCOMBI_CONSTEXPR_FUN_ARGS) check_cxx_compiler_flag('-march=native' HPCOMBI_HAVE_FLAG_ARCH_NATIVE) check_cxx_compiler_flag('-mtune=native' HPCOMBI_HAVE_FLAG_TUNE_NATIVE) diff --git a/config.h.in b/config.h.in index f84cbbfa..7a1f2ccc 100644 --- a/config.h.in +++ b/config.h.in @@ -8,19 +8,10 @@ #ifndef HPCOMBI_CONFIG_HPP #define HPCOMBI_CONFIG_HPP -// Whether the compiler provide the "experimental/numeric" include file -#cmakedefine HPCOMBI_HAVE_EXPERIMENTAL_NUMERIC - -// Whether std::experimental::lcm function works -#cmakedefine HPCOMBI_HAVE_EXPERIMENTAL_NUMERIC_LCM - // Google sparse hash map #cmakedefine HPCOMBI_HAVE_DENSEHASHMAP // Google sparse hash set #cmakedefine HPCOMBI_HAVE_DENSEHASHSET -// GCC-4.8 constexpr function argument bug -#cmakedefine HPCOMBI_CONSTEXPR_FUN_ARGS - #endif // HPCOMBI_CONFIG_HPP