CMake: Rename DEAL_II_CAN_USE_CXX1X with DEAL_II_CAN_USECXX11, provide a compatibilit...

git-svn-id: https://svn.dealii.org/trunk@28855 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/checks/check_01_cxx_features.cmake b/deal.II/cmake/checks/check_01_cxx_features.cmake
index 6e4b497a91c913d540dfcde860b450945801a317..803fb4abec5338f71f80c870d3ae4bf2723b1ce6 100644 (file)
--- a/deal.II/cmake/checks/check_01_cxx_features.cmake
+++ b/deal.II/cmake/checks/check_01_cxx_features.cmake
@@ -19,7 +19,6 @@
 #
 #   DEAL_II_HAVE_CXX11_FLAG
 #   DEAL_II_CXX11_FLAG
-#   DEAL_II_CAN_USE_CXX1X
 #   DEAL_II_CAN_USE_CXX11
 #   HAVE_ISNAN
 #   HAVE_UNDERSCORE_ISNAN
@@ -164,7 +163,6 @@ IF(DEAL_II_HAVE_CXX11_FLAG)
 
     MESSAGE(STATUS "Sufficient C++11 support. Enabling ${DEAL_II_CXX11_FLAG}.")
 
-    SET(DEAL_II_CAN_USE_CXX1X TRUE) # TODO
     SET(DEAL_II_CAN_USE_CXX11 TRUE)
 
     ADD_FLAGS(CMAKE_CXX_FLAGS "${DEAL_II_CXX11_FLAG}")
@@ -173,41 +171,43 @@ IF(DEAL_II_HAVE_CXX11_FLAG)
     MESSAGE(STATUS "Insufficient C++11 support. Disabling ${DEAL_II_CXX11_FLAG}.")
   ENDIF()
 
-
-  IF(DEAL_II_CAN_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
-    # we might want to test in the testsuite
-    #
-    # TODO: Actually we have to export the test results somehow. :-]
-    #
-
-    CHECK_CXX_SOURCE_COMPILES(
-      "
-      #include <vector>
-      std::vector<int> v;
-      int main(){ auto i = v.begin(); *i; return 0;}
-      "
-      DEAL_II_HAVE_CXX11_AUTO_TYPE)
-
-    CHECK_CXX_SOURCE_COMPILES(
-      "
-      #include <vector>],
-      std::vector<int> v;
-      int main(){ for (std::vector<int>::iterator i : v) *i; return 0;}
-      "
-      DEAL_II_HAVE_CXX11_RANGE_BASED_FOR)
-
-    IF( DEAL_II_HAVE_CXX11_AUTO_TYPE AND
-        DEAL_II_HAVE_CXX11_RANGE_BASED_FOR )
-
-      MESSAGE(STATUS "Additional C++11 support available.")
-
-      SET(DEAL_II_CAN_USE_ADDITIONAL_CXX1X_FEATURES)
-
-    ENDIF()
-  ENDIF()
+#
+# Currently unused
+#
+#  IF(DEAL_II_CAN_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
+#    # we might want to test in the testsuite
+#    #
+#    # TODO: Actually we have to export the test results somehow. :-]
+#    #
+#
+#    CHECK_CXX_SOURCE_COMPILES(
+#      "
+#      #include <vector>
+#      std::vector<int> v;
+#      int main(){ auto i = v.begin(); *i; return 0;}
+#      "
+#      DEAL_II_HAVE_CXX11_AUTO_TYPE)
+#
+#    CHECK_CXX_SOURCE_COMPILES(
+#      "
+#      #include <vector>],
+#      std::vector<int> v;
+#      int main(){ for (std::vector<int>::iterator i : v) *i; return 0;}
+#      "
+#      DEAL_II_HAVE_CXX11_RANGE_BASED_FOR)
+#
+#    IF( DEAL_II_HAVE_CXX11_AUTO_TYPE AND
+#        DEAL_II_HAVE_CXX11_RANGE_BASED_FOR )
+#
+#      MESSAGE(STATUS "Additional C++11 support available.")
+#
+#      SET(DEAL_II_CAN_USE_ADDITIONAL_CXX1X_FEATURES)
+#    ENDIF()
+#
+#  ENDIF()
 
   POP_TEST_FLAG()
 

diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in
index 713509f711f9992cfe8d1dd5656120a53f8aff27..9e2960ad17508324cc40e7bb6da41fa39eb4cd48 100644 (file)
--- a/deal.II/include/deal.II/base/config.h.in
+++ b/deal.II/include/deal.II/base/config.h.in
@@ -111,7 +111,10 @@
  * to allow using the standard library classes instead of the corresponding
  * BOOST classes.
  */
-#cmakedefine DEAL_II_CAN_USE_CXX1X
+#cmakedefine DEAL_II_CAN_USE_CXX11
+#ifdef DEAL_II_CAN_USE_CXX11
+# define DEAL_II_CAN_USE_CXX1X
+#endif
 
 /* Defined if isnan is available */
 #cmakedefine HAVE_ISNAN

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 53797cc18306913b116e4bfaa5d276d8f56f3f3f..b9e7a72f8b04b6e2cd35962b3f9feb9c790bb883 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/array.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/array.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 8cf368b807204c27f9ad1dec977545c806c08bde..49979bef2e1aa2c02f585b22855a279b56e69e0f 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/bind.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/bind.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 6cc7125205a896da47e82b77fcbd9098f60ee19d..b439d5c91ab0f06f519a64530091626b9e8702dc 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
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 8140fa1c7ef6824443dcf037c705ecfb9b7fc720..18f807e49947fa4d84b7b3a0016ddce1643b5dfd 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/function.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/function.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 d58330ae005903abf00e54664c7329f52f7cc319..df5652a4be097643b75000ba20a3007897de9690 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/mutex.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/mutex.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 71a784d359f533dde4e138170d74bcc554fbdd0a..9babfec48e3dda132e5c98f8629f119e73245ffb 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
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 f471d8d0e8f1cadb0b72796e28fd65190e366447..bcbc1c5dfa91d156e20461b87aafccbf488bb7fd 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/thread.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/thread.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 293c1a45b9d26e06cb596832a78ce3d78fdf6ecd..4bcf46951f7dcff3724428ae5fada0b62922296c 100644 (file)
--- a/deal.II/include/deal.II/base/std_cxx1x/tuple.h
+++ b/deal.II/include/deal.II/base/std_cxx1x/tuple.h
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_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 09b5a3d60286082cf3eceefb118d8ddf7b810845..31bceaaf67415f8e9d4e8cfa49b1fc08671dae81 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
@@ -16,7 +16,7 @@
 
 #include <deal.II/base/config.h>
 
-#ifdef DEAL_II_CAN_USE_CXX1X
+#ifdef DEAL_II_CAN_USE_CXX11
 
 #  include <type_traits>
 DEAL_II_NAMESPACE_OPEN