From e87a31cc17a924eb687e1a0998b516f85d066a95 Mon Sep 17 00:00:00 2001
From: David Wells <drwells@email.unc.edu>
Date: Sun, 24 May 2020 21:12:54 -0400
Subject: [PATCH] Clean up some more C++14 documentation.

---
 cmake/macros/macro_deal_ii_pickup_tests.cmake | 2 +-
 cmake/setup_compiler_flags.cmake              | 2 +-
 cmake/setup_compiler_flags_gnu.cmake          | 4 ++--
 doc/developers/cmake-internals.html           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/macros/macro_deal_ii_pickup_tests.cmake b/cmake/macros/macro_deal_ii_pickup_tests.cmake
index 3db9b0ca8b..2345d09577 100644
--- a/cmake/macros/macro_deal_ii_pickup_tests.cmake
+++ b/cmake/macros/macro_deal_ii_pickup_tests.cmake
@@ -85,7 +85,7 @@ MACRO(DEAL_II_PICKUP_TESTS)
 
   IF(DEAL_II_WITH_CUDA)
     FIND_PACKAGE(CUDA)
-    SET(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -std=c++11 -arch=sm_35 -Xcompiler ${OpenMP_CXX_FLAGS})
+    SET(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -std=c++14 -arch=sm_35 -Xcompiler ${OpenMP_CXX_FLAGS})
   ENDIF()
 
   FIND_PACKAGE(Perl REQUIRED)
diff --git a/cmake/setup_compiler_flags.cmake b/cmake/setup_compiler_flags.cmake
index 6079db8490..4234ccb3b2 100644
--- a/cmake/setup_compiler_flags.cmake
+++ b/cmake/setup_compiler_flags.cmake
@@ -45,7 +45,7 @@
 #   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-fpic")
 #   ENABLE_IF_LINKS(DEAL_II_LINKER_FLAGS "-Wl,--as-needed")
 #
-# Checks for compiler features (such as C++11 support) and compiler
+# Checks for compiler features (such as C++14 support) and compiler
 # specific bugs that
 #   - usually set up further configuration (such as preprocessor
 #     definitions)
diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake
index 63aa969d15..78a54771d9 100644
--- a/cmake/setup_compiler_flags_gnu.cmake
+++ b/cmake/setup_compiler_flags_gnu.cmake
@@ -23,7 +23,7 @@
 IF( CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND
     CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9" )
   MESSAGE(WARNING "\n"
-    "deal.II requires support for features of C++11 that are not present in\n"
+    "deal.II requires support for features of C++14 that are not present in\n"
     "versions of GCC prior to 4.9."
     )
 ENDIF()
@@ -31,7 +31,7 @@ ENDIF()
 IF( CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND
     CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.0" )
   MESSAGE(WARNING "\n"
-    "deal.II requires support for features of C++11 that are not present in\n"
+    "deal.II requires support for features of C++14 that are not present in\n"
     "versions of Clang prior to 4.0."
     )
 ENDIF()
diff --git a/doc/developers/cmake-internals.html b/doc/developers/cmake-internals.html
index d54354f4ed..be102262ee 100644
--- a/doc/developers/cmake-internals.html
+++ b/doc/developers/cmake-internals.html
@@ -223,7 +223,7 @@ SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}
     guarded with DEAL_II_ALLOW_PLATFORM_INTROSPECTION
 
 ./cmake/checks/check_01_cxx_features.cmake
-  - Check for supported C++ language features such as sufficient C++11
+  - Check for supported C++ language features such as sufficient C++14
     support
 
 ./cmake/checks/check_02_compiler_features.cmake
@@ -586,7 +586,7 @@ DEAL_II_FORCE_BUNDLED_&lt;FEATURE&gt;        (an option)
 
     <li>
       For internal and external use, for setting necessary compiler flags,
-      e.g. <code>-std=c++11</code> (if available):
+      e.g. <code>-std=c++20</code> (if available):
       <ul>
         <li> <code>DEAL_II_CXX_FLAGS</code>
         <li> <code>DEAL_II_CXX_FLAGS_DEBUG</code>
-- 
2.39.5