From 76137a0bd65ae6bd8bcad5a7ac350b9ea241e24d Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 6 May 2018 12:18:05 -0500 Subject: [PATCH] CMake: Partially revert #6490 --- cmake/checks/check_01_cxx_features.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index f5581563f0..7a7680aef2 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -180,18 +180,15 @@ IF(NOT DEFINED DEAL_II_WITH_CXX14 OR DEAL_II_WITH_CXX14) PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}") # - # We assume std::max has a constexpr version and make_unique works + # We assume std::make_unique works # CHECK_CXX_SOURCE_COMPILES( " #include - #include int main() { auto ptr = std::make_unique(42); - constexpr int bob = std::max(sizeof(ptr), sizeof(char[8])); - int bobs[bob]; return 0; } " @@ -199,7 +196,7 @@ IF(NOT DEFINED DEAL_II_WITH_CXX14 OR DEAL_II_WITH_CXX14) # # This test checks constexpr std::max/min support. Unfortunately, - # gcc-4.9 does claim to support C++14 but fails to provide a constexpr + # gcc-4.9 claims to support C++14 but fails to provide a constexpr # compatible std::max/min. Disable C++14 support in this case. # CHECK_CXX_SOURCE_COMPILES( -- 2.39.5