Rename DEAL_II_CAN_USE_CXX11 to DEAL_II_USE_CXX11 to make the fact clear that we...

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 897b4632e1d087d9d401afcb9288696b1db82503..ff7abbe9212fda5bf02750b5c39055b7800d5639 100644 (file)
--- 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 2e7be178390539e720ed9800b6e9e4b23ec9bde5..a6ad99cae4e114ec8e52255bf602c564e1d4b80d 100644 (file)
--- 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<typename T> struct weak_ptr_traits<std::weak_ptr<T> >
     {
       typedef std::shared_ptr<T> shared_type;
@@ -54,7 +54,7 @@ namespace boost
       typedef boost::weak_ptr<T> weak_type;
     };
 // as above
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
     template<typename T> struct shared_ptr_traits<std::shared_ptr<T> >
     {
       typedef std::weak_ptr<T> 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 7fcf064bfb3b6778b93198b4ee57b1306c2802dd..e872415eb3789c5bc9aa7c724a357760fb93c9a5 100644 (file)
--- 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 bb63ba07404e9665c70b92fcfea422859832ef65..66d9b54c2b7fbb3c2846905255e7826ec8dacd18 100644 (file)
--- 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 ac15b3405123564435c034a5b19da41af2fbe254..66930730424c59362620e07fca179cd0407fc7d9 100644 (file)
--- 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 ad1681b62e5c5e08fe3ba3ec6f9c8a573ace4081..d033635bfd522cf4074a86f5d1b494bb771da978 100644 (file)
--- 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 c660d09b546f6eb07af66fbc6871a6f17046b8ea..68b8060321e6810aedef0282adaf0584542450d2 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <array>
 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 0c14d2ad0af34ab2ae95dee913e6b7f88d756a7c..9cb2192988e3bb76f447b3079d98ac4444dc66ff 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <functional>
 

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 89429ef2fcfb4f0e6f3c7c5b08421becf0a60b70..4fd712c36cf850654ac0322c1d02c2e863006e66 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <condition_variable>
 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 d3e902ff894ea5b655d0bc2bb43484a5bca929d7..86aea59ed13d2d49a397a9d591ab70ed28c2956f 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <functional>
 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 817ebda660445380dfdf35dd2aa74e07ac80e1ff..7c195fffc90fd613c1d0f08dcdb39ae5d5938374 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <mutex>
 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 f8a6744ce536e07ee589badad51a88011b7f4a2d..172218dedad4ba748e428581079b6ae0cc88c718 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <memory>
 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 6b43b2525abe7e2cfcd7d56b6fbccaa863b5e2b0..ac3ed95d4dcf6bb1919fbc4c51055ebdb3f37ff7 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <thread>
 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 0282c112da6354689786e34d95203fb024dfffde..b3d846da6ed3f90f28c7a4efcbca25736dfbd51e 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <tuple>
 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 f64cf36d60a974644a5447e6d02eb1c9a91e58d8..d0e34b3280000c1184e912d509edc6d2d4926166 100644 (file)
--- 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 <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_USE_CXX11
 
 #  include <type_traits>
 DEAL_II_NAMESPACE_OPEN