From 5a626281d9a06528365980499a06fb92100f8b28 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 21 May 2020 22:09:27 -0500 Subject: [PATCH] remove DEAL_II_IS_TRIVIALLY_COPYABLE --- cmake/checks/check_01_cxx_features.cmake | 9 --------- cmake/configure/configure_1_threads.cmake | 10 ---------- include/deal.II/base/config.h.in | 1 - 3 files changed, 20 deletions(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index 151e50b65a..f626e1b958 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -21,7 +21,6 @@ # DEAL_II_HAVE_CXX17 # # DEAL_II_HAVE_ATTRIBUTE_FALLTHROUGH -# DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE # DEAL_II_HAVE_CXX14_CONSTEXPR # DEAL_II_HAVE_FP_EXCEPTIONS # DEAL_II_HAVE_COMPLEX_OPERATOR_OVERLOADS @@ -269,7 +268,6 @@ ENDIF() UNSET_IF_CHANGED(CHECK_CXX_FEATURES_FLAGS_SAVED "${CMAKE_REQUIRED_FLAGS}" DEAL_II_HAVE_ATTRIBUTE_FALLTHROUGH - DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE DEAL_II_HAVE_CXX14_CONSTEXPR DEAL_II_HAVE_FP_EXCEPTIONS DEAL_II_HAVE_COMPLEX_OPERATOR_OVERLOADS @@ -337,13 +335,6 @@ ENDIF() ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${DEAL_II_CXX_VERSION_FLAG}") -CHECK_CXX_SOURCE_COMPILES( - " - #include - int main(){ std::is_trivially_copyable bob; } - " - DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE) - RESET_CMAKE_REQUIRED() # diff --git a/cmake/configure/configure_1_threads.cmake b/cmake/configure/configure_1_threads.cmake index 520f7ceaee..c15b94b78c 100644 --- a/cmake/configure/configure_1_threads.cmake +++ b/cmake/configure/configure_1_threads.cmake @@ -151,16 +151,6 @@ MACRO(FEATURE_THREADS_CONFIGURE_EXTERNAL) ENDIF() ENDIF() - # - # Workaround for an issue with C++11 mode, non gcc-compilers and missing - # template std::is_trivially_copyable - # - IF( NOT DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE AND - NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU" ) - LIST(APPEND THREADS_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") - LIST(APPEND THREADS_USER_DEFINITIONS "TBB_IMPLEMENT_CPP0X=1") - ENDIF() - SETUP_THREADING() LIST(APPEND THREADS_LIBRARIES ${TBB_LIBRARIES}) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 4dbecd2c06..61181c61fa 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -139,7 +139,6 @@ #cmakedefine DEAL_II_HAVE_CXX17 -#cmakedefine DEAL_II_HAVE_CXX11_IS_TRIVIALLY_COPYABLE #cmakedefine DEAL_II_HAVE_CXX14_CONSTEXPR #cmakedefine DEAL_II_HAVE_FP_EXCEPTIONS #cmakedefine DEAL_II_HAVE_COMPLEX_OPERATOR_OVERLOADS -- 2.39.5