From a68913fa63e53d981c27f3e43339e461b594e82e Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 17 Dec 2017 16:03:50 -0500 Subject: [PATCH] Remove some more DEAL_II_WITH_CXX11 references. --- doc/doxygen/headers/laoperators.h | 9 ++------- doc/doxygen/options.dox.in | 2 +- doc/users/cmake.html | 15 ++++++--------- doc/users/config.sample | 12 ------------ tests/base/quadrature_point_data.cc | 11 ----------- 5 files changed, 9 insertions(+), 40 deletions(-) diff --git a/doc/doxygen/headers/laoperators.h b/doc/doxygen/headers/laoperators.h index 349d41bdd9..fe039b3e7e 100644 --- a/doc/doxygen/headers/laoperators.h +++ b/doc/doxygen/headers/laoperators.h @@ -20,13 +20,8 @@ * *

Linear Operator

* - * If deal.II is configured with C++11 support (i.e., - * DEAL_II_WITH_CXX11=ON or DEAL_II_WITH_CXX14=ON - * during configuration) a versatile mechanism for storing the concept of a - * linear operator is available. (For questions about C++11, see - * @ref CPP11 .) - * - * This is done with a LinearOperator class that, like + * deal.II includes support for describing linear transformations in a very + * general way. This is done with a LinearOperator class that, like * @ref ConceptMatrixType "the MatrixType concept", * defines a minimal interface for applying a linear operation on a * vector. diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in index d5555be6b4..c1770131a2 100644 --- a/doc/doxygen/options.dox.in +++ b/doc/doxygen/options.dox.in @@ -173,8 +173,8 @@ PREDEFINED = DOXYGEN=1 \ DEAL_II_WITH_ARPACK=1 \ DEAL_II_ARPACK_WITH_PARPACK=1 \ DEAL_II_WITH_BOOST=1 \ - DEAL_II_WITH_CXX11=1 \ DEAL_II_WITH_CXX14=1 \ + DEAL_II_WITH_CXX17=1 \ DEAL_II_WITH_CUDA=1 \ DEAL_II_WITH_GSL=1 \ DEAL_II_WITH_HDF5=1 \ diff --git a/doc/users/cmake.html b/doc/users/cmake.html index ec370a953f..1e538e2ef9 100644 --- a/doc/users/cmake.html +++ b/doc/users/cmake.html @@ -433,15 +433,12 @@ library - builds and installs the 'library' component checking which language version flags work with the detected compiler. For example: if CMake detects GCC 5.1 or Clang 3.6, deal.II will be compiled - in C++14 mode unless either C++14 - or C++11 is explicitly disabled. Another example: - if DEAL_II_WITH_CXX11=ON is passed to CMake, - then deal.II will check if the compiler supports enough - parts of the C++11 and - C++14 language standards. CMake will not fail in - this example just because the compiler does not support - C++14, but CMake will fail if the - compiler does not support enough of C++11. + in C++14 mode unless C++14 support is explicitly + disabled. Another example: if DEAL_II_WITH_CXX14=ON is passed + to CMake, then deal.II will check if the + compiler supports enough of the C++14 standard to enable + the C++14-specific parts of the library. The configuration + process will fail if a feature flag is passed in that cannot be supported. The remaining flags are set to ON if an external package is found or to OFF otherwise. By explicitly setting it to off diff --git a/doc/users/config.sample b/doc/users/config.sample index 747b6586b5..253f68dd7f 100644 --- a/doc/users/config.sample +++ b/doc/users/config.sample @@ -566,18 +566,6 @@ # # ########################################################################### -# -# C++11 support: -# -# SET(DEAL_II_WITH_CXX11 ON CACHE BOOL -# "deal.II using C++11 language standard" -# ) -# -# A custom C++11 flag can be set by setting -# -# SET(DEAL_II_CXX_VERSION_FLAG "-std=c++0x" CACHE STRING "") -# - # # C++14 support: # diff --git a/tests/base/quadrature_point_data.cc b/tests/base/quadrature_point_data.cc index 472508c157..b2bb871393 100644 --- a/tests/base/quadrature_point_data.cc +++ b/tests/base/quadrature_point_data.cc @@ -23,8 +23,6 @@ #include "../tests.h" -#ifdef DEAL_II_WITH_CXX11 - #include #include #include @@ -206,12 +204,3 @@ int main(int argc, char *argv[]) test<2>(); } - -#else -int main(int argc, char *argv[]) -{ - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - mpi_initlog(); - deallog << "Ok" << std::endl; -} -#endif -- 2.39.5