From: Matthias Maier Date: Mon, 13 Apr 2015 22:00:49 +0000 (+0200) Subject: Correctly guard C++11 code with DEAL_II_WITH_CXX11 X-Git-Tag: v8.3.0-rc1~242^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1bc89ec578f41c5c801890855f55280d9b00e5f;p=dealii.git Correctly guard C++11 code with DEAL_II_WITH_CXX11 --- diff --git a/include/deal.II/lac/block_vector.h b/include/deal.II/lac/block_vector.h index d7013ee2a9..cf8800f5fc 100644 --- a/include/deal.II/lac/block_vector.h +++ b/include/deal.II/lac/block_vector.h @@ -23,6 +23,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -460,6 +461,8 @@ void swap (BlockVector &u, } +#ifdef DEAL_II_WITH_CXX11 + namespace internal { namespace LinearOperator @@ -507,6 +510,8 @@ namespace internal } /* namespace LinearOperator */ } /* namespace internal */ +#endif /* DEAL_II_WITH_CXX11 */ + DEAL_II_NAMESPACE_CLOSE #endif diff --git a/include/deal.II/lac/trilinos_block_vector.h b/include/deal.II/lac/trilinos_block_vector.h index 0a820a05ca..277a56f410 100644 --- a/include/deal.II/lac/trilinos_block_vector.h +++ b/include/deal.II/lac/trilinos_block_vector.h @@ -27,6 +27,8 @@ # include # include +# include + DEAL_II_NAMESPACE_OPEN // forward declaration @@ -452,6 +454,8 @@ namespace TrilinosWrappers /*@}*/ +#ifdef DEAL_II_WITH_CXX11 + namespace internal { namespace LinearOperator @@ -499,6 +503,9 @@ namespace internal } /* namespace LinearOperator */ } /* namespace internal */ +#endif /* DEAL_II_WITH_CXX11 */ + + DEAL_II_NAMESPACE_CLOSE #endif // DEAL_II_WITH_TRILINOS diff --git a/include/deal.II/lac/trilinos_parallel_block_vector.h b/include/deal.II/lac/trilinos_parallel_block_vector.h index f1d102b186..59a52b1346 100644 --- a/include/deal.II/lac/trilinos_parallel_block_vector.h +++ b/include/deal.II/lac/trilinos_parallel_block_vector.h @@ -26,6 +26,8 @@ # include # include +# include + DEAL_II_NAMESPACE_OPEN // forward declaration @@ -466,6 +468,9 @@ namespace TrilinosWrappers /*@}*/ + +#ifdef DEAL_II_WITH_CXX11 + namespace internal { namespace LinearOperator @@ -513,6 +518,7 @@ namespace internal } /* namespace LinearOperator */ } /* namespace internal */ +#endif /* DEAL_II_WITH_CXX11 */ DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 0eca9b6254..c61bac8536 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -34,6 +34,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include "Epetra_LocalMap.h" DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +# include + DEAL_II_NAMESPACE_OPEN @@ -940,6 +942,8 @@ namespace TrilinosWrappers /*@}*/ +#ifdef DEAL_II_WITH_CXX11 + namespace internal { namespace LinearOperator @@ -1025,6 +1029,8 @@ namespace internal } /* namespace LinearOperator */ } /* namespace internal */ +#endif /* DEAL_II_WITH_CXX11 */ + DEAL_II_NAMESPACE_CLOSE