From 1beaf3f415ae7ca638c9a2fc89d3394f6808a3a6 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 12 Sep 2012 10:25:09 +0000 Subject: [PATCH] config.h.in updated git-svn-id: https://svn.dealii.org/branches/branch_cmake@26302 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/config.h.in | 42 +++++++++++++------- deal.II/include/deal.II/base/config.h.in.old | 5 --- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index 7854256881..b68a4005eb 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -158,13 +158,39 @@ /* - * Configured in check_for_cxx_features: + * Configured in check_for_compiler_features */ /* Defined if vector iterators are just plain pointers */ #cmakedefine DEAL_II_VECTOR_ITERATOR_IS_POINTER + + + +/* + * Configured in check_for_compiler_bugs: + */ + + +/* Define if we have to work around a bug in gcc with explicitly instantiating + template member operators. See the aclocal.m4 file in the top-level + directory for a description of this bug. */ +#define DEAL_II_MEMBER_OP_TEMPLATE_INST @DEAL_II_MEMBER_OP_TEMPLATE_INST@ + + + + +/* + * Configured in check_for_cxx_features: + */ + + +/* Defined if the compiler we use supports the C++2011 standard well enough to + allow using the standard library classes instead of the corresponding BOOST + classes. */ +#cmakedefine DEAL_II_CAN_USE_CXX1X + /* Defined if the compiler provides an header file */ #cmakedefine HAVE_STD_OSTREAM_HEADER @@ -201,20 +227,6 @@ -/* - * Configured in check_for_compiler_bugs: - */ - - -/* Define if we have to work around a bug in gcc with explicitly instantiating - template member operators. See the aclocal.m4 file in the top-level - directory for a description of this bug. */ -#define DEAL_II_MEMBER_OP_TEMPLATE_INST @DEAL_II_MEMBER_OP_TEMPLATE_INST@ - - - - - #include #include diff --git a/deal.II/include/deal.II/base/config.h.in.old b/deal.II/include/deal.II/base/config.h.in.old index f4c943252b..2a5b16917c 100644 --- a/deal.II/include/deal.II/base/config.h.in.old +++ b/deal.II/include/deal.II/base/config.h.in.old @@ -39,11 +39,6 @@ floating point computations on cygwin systems. */ #cmakedefine DEAL_II_BROKEN_SOCKETS -/* Defined if the compiler we use supports the C++2011 standard well enough to - allow using the standard library classes instead of the corresponding BOOST - classes. */ -#cmakedefine DEAL_II_CAN_USE_CXX1X - /* Backward compatibility support for functions and classes that do not take an explicit mapping variable, but rather use a default Q1 mapping instead */ -- 2.39.5