From: Matthias Maier Date: Tue, 15 Oct 2013 08:17:22 +0000 (+0000) Subject: Rename DEAL_II_CAN_USE_CXX11 to DEAL_II_USE_CXX11 to make the fact clear that we... X-Git-Tag: v8.1.0~570^2~63 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd32a711958ec9e34cd04bd2dbd7d9f3dc777af8;p=dealii.git Rename DEAL_II_CAN_USE_CXX11 to DEAL_II_USE_CXX11 to make the fact clear that we'll use it.. Provide a compatibility definition of DEAL_II_CAN_USE_CXX11 in config.h.in git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31234 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/bundled/CMakeLists.txt b/deal.II/bundled/CMakeLists.txt index 897b4632e1..ff7abbe921 100644 --- a/deal.II/bundled/CMakeLists.txt +++ b/deal.II/bundled/CMakeLists.txt @@ -41,7 +41,7 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED) ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src) - IF( DEAL_II_WITH_THREADS AND NOT DEAL_II_CAN_USE_CXX11) + IF( DEAL_II_WITH_THREADS AND NOT DEAL_II_USE_CXX11) # # If the C++ compiler doesn't completely support the C++11 standard # (and consequently we can't use std::thread, std::mutex, etc), then diff --git a/deal.II/bundled/boost-1.49.0/include/boost/signals2/detail/foreign_ptr.hpp b/deal.II/bundled/boost-1.49.0/include/boost/signals2/detail/foreign_ptr.hpp index 2e7be17839..a6ad99cae4 100644 --- a/deal.II/bundled/boost-1.49.0/include/boost/signals2/detail/foreign_ptr.hpp +++ b/deal.II/bundled/boost-1.49.0/include/boost/signals2/detail/foreign_ptr.hpp @@ -39,7 +39,7 @@ namespace boost // should only be used by deal.II and dependent projects... // // - Maier, 2013 -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 template struct weak_ptr_traits > { typedef std::shared_ptr shared_type; @@ -54,7 +54,7 @@ namespace boost typedef boost::weak_ptr weak_type; }; // as above -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 template struct shared_ptr_traits > { typedef std::weak_ptr weak_type; diff --git a/deal.II/cmake/checks/check_01_cxx_features.cmake b/deal.II/cmake/checks/check_01_cxx_features.cmake index 7fcf064bfb..e872415eb3 100644 --- a/deal.II/cmake/checks/check_01_cxx_features.cmake +++ b/deal.II/cmake/checks/check_01_cxx_features.cmake @@ -21,7 +21,7 @@ # # DEAL_II_HAVE_CXX11_FLAG # DEAL_II_CXX11_FLAG -# DEAL_II_CAN_USE_CXX11 +# DEAL_II_USE_CXX11 # HAVE_ISNAN # HAVE_UNDERSCORE_ISNAN # DEAL_II_HAVE_ISFINITE @@ -168,7 +168,7 @@ IF(DEAL_II_HAVE_CXX11_FLAG) MESSAGE(STATUS "Sufficient C++11 support. Enabling ${DEAL_II_CXX11_FLAG}.") - SET(DEAL_II_CAN_USE_CXX11 TRUE) + SET(DEAL_II_USE_CXX11 TRUE) ADD_FLAGS(CMAKE_CXX_FLAGS "${DEAL_II_CXX11_FLAG}") @@ -179,7 +179,7 @@ IF(DEAL_II_HAVE_CXX11_FLAG) # # Currently unused # -# IF(DEAL_II_CAN_USE_CXX11) +# IF(DEAL_II_USE_CXX11) # # # # Also test for a couple of C++11 things that we don't use in the # # library but that users may want to use in their applications and that diff --git a/deal.II/cmake/checks/check_03_compiler_bugs.cmake b/deal.II/cmake/checks/check_03_compiler_bugs.cmake index bb63ba0740..66d9b54c2b 100644 --- a/deal.II/cmake/checks/check_03_compiler_bugs.cmake +++ b/deal.II/cmake/checks/check_03_compiler_bugs.cmake @@ -320,6 +320,6 @@ IF(DEAL_II_ICC_NUMERICLIMITS_BUG) ) STRIP_FLAG(CMAKE_CXX_FLAGS "${DEAL_II_CXX11_FLAG}") SET(DEAL_II_CAN_USE_CXX1X FALSE) - SET(DEAL_II_CAN_USE_CXX11 FALSE) + SET(DEAL_II_USE_CXX11 FALSE) ENDIF() diff --git a/deal.II/cmake/configure/configure_2_trilinos.cmake b/deal.II/cmake/configure/configure_2_trilinos.cmake index ac15b34051..6693073042 100644 --- a/deal.II/cmake/configure/configure_2_trilinos.cmake +++ b/deal.II/cmake/configure/configure_2_trilinos.cmake @@ -160,7 +160,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # with the -std=c++0x flag of GCC, see deal.II FAQ. # Test whether that is indeed the case # - IF(DEAL_II_CAN_USE_CXX11 AND NOT TRILINOS_SUPPORTS_CPP11) + IF(DEAL_II_USE_CXX11 AND NOT TRILINOS_SUPPORTS_CPP11) IF(TRILINOS_HAS_C99_TR1_WORKAROUND) LIST(APPEND DEAL_II_DEFINITIONS "HAS_C99_TR1_CMATH") diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index ad1681b62e..d033635bfd 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -115,8 +115,9 @@ * to allow using the standard library classes instead of the corresponding * BOOST classes. */ -#cmakedefine DEAL_II_CAN_USE_CXX11 -#ifdef DEAL_II_CAN_USE_CXX11 +#cmakedefine DEAL_II_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 +# define DEAL_II_CAN_USE_CXX11 # define DEAL_II_CAN_USE_CXX1X #endif diff --git a/deal.II/include/deal.II/base/std_cxx1x/array.h b/deal.II/include/deal.II/base/std_cxx1x/array.h index c660d09b54..68b8060321 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/array.h +++ b/deal.II/include/deal.II/base/std_cxx1x/array.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/bind.h b/deal.II/include/deal.II/base/std_cxx1x/bind.h index 0c14d2ad0a..9cb2192988 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/bind.h +++ b/deal.II/include/deal.II/base/std_cxx1x/bind.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include diff --git a/deal.II/include/deal.II/base/std_cxx1x/condition_variable.h b/deal.II/include/deal.II/base/std_cxx1x/condition_variable.h index 89429ef2fc..4fd712c36c 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/condition_variable.h +++ b/deal.II/include/deal.II/base/std_cxx1x/condition_variable.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/function.h b/deal.II/include/deal.II/base/std_cxx1x/function.h index d3e902ff89..86aea59ed1 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/function.h +++ b/deal.II/include/deal.II/base/std_cxx1x/function.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/mutex.h b/deal.II/include/deal.II/base/std_cxx1x/mutex.h index 817ebda660..7c195fffc9 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/mutex.h +++ b/deal.II/include/deal.II/base/std_cxx1x/mutex.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/shared_ptr.h b/deal.II/include/deal.II/base/std_cxx1x/shared_ptr.h index f8a6744ce5..172218deda 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/shared_ptr.h +++ b/deal.II/include/deal.II/base/std_cxx1x/shared_ptr.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/thread.h b/deal.II/include/deal.II/base/std_cxx1x/thread.h index 6b43b2525a..ac3ed95d4d 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/thread.h +++ b/deal.II/include/deal.II/base/std_cxx1x/thread.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/tuple.h b/deal.II/include/deal.II/base/std_cxx1x/tuple.h index 0282c112da..b3d846da6e 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/tuple.h +++ b/deal.II/include/deal.II/base/std_cxx1x/tuple.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/include/deal.II/base/std_cxx1x/type_traits.h b/deal.II/include/deal.II/base/std_cxx1x/type_traits.h index f64cf36d60..d0e34b3280 100644 --- a/deal.II/include/deal.II/base/std_cxx1x/type_traits.h +++ b/deal.II/include/deal.II/base/std_cxx1x/type_traits.h @@ -20,7 +20,7 @@ #include -#ifdef DEAL_II_CAN_USE_CXX11 +#ifdef DEAL_II_USE_CXX11 # include DEAL_II_NAMESPACE_OPEN