]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Correctly guard C++11 code with DEAL_II_WITH_CXX11
authorMatthias Maier <tamiko@43-1.org>
Mon, 13 Apr 2015 22:00:49 +0000 (00:00 +0200)
committerMatthias Maier <tamiko@43-1.org>
Sun, 19 Apr 2015 20:55:06 +0000 (22:55 +0200)
include/deal.II/lac/block_vector.h
include/deal.II/lac/trilinos_block_vector.h
include/deal.II/lac/trilinos_parallel_block_vector.h
include/deal.II/lac/trilinos_vector.h

index d7013ee2a92c993a4eb8f2138b1aa5540f33a00a..cf8800f5fcd3326c6cc5e97d0d3ec21354024ae5 100644 (file)
@@ -23,6 +23,7 @@
 #include <deal.II/lac/block_vector_base.h>
 
 #include <cstdio>
+#include <functional>
 #include <vector>
 
 DEAL_II_NAMESPACE_OPEN
@@ -460,6 +461,8 @@ void swap (BlockVector<Number> &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
index 0a820a05caebb01a64f26df2de0612eabdc73843..277a56f4104085c00e1f882d212dbe1785d805ad 100644 (file)
@@ -27,6 +27,8 @@
 #  include <deal.II/lac/block_vector_base.h>
 #  include <deal.II/lac/exceptions.h>
 
+#  include <functional>
+
 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
index f1d102b1866230cd34f02c8999ebd8c0e26c6bf9..59a52b13469451d8503c65652dc78f847c933fb7 100644 (file)
@@ -26,6 +26,8 @@
 #  include <deal.II/lac/block_vector_base.h>
 #  include <deal.II/lac/exceptions.h>
 
+#  include <functional>
+
 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
index 0eca9b62543b2618c7330f4ed75cc36feed1593d..c61bac8536773cbe9dfa3d04cbda86a329d2966d 100644 (file)
@@ -34,6 +34,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include "Epetra_LocalMap.h"
 DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
+#  include <functional>
+
 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
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.