From: Bruno Turcksin Date: Fri, 22 Jul 2016 18:06:30 +0000 (-0400) Subject: Use DEAL_II_WITH_CXX11 to guard c++11 code. X-Git-Tag: v8.5.0-rc1~809^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c696008374a3ceec40fe39f68ba171a887c4e148;p=dealii.git Use DEAL_II_WITH_CXX11 to guard c++11 code. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fb2debfca6..b87921f9e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,9 @@ ADD_SUBDIRECTORY(source) # has to be included after bundled ADD_SUBDIRECTORY(cmake/config) # has to be included after source ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(contrib/python-bindings/source) +IF(DEAL_II_WITH_PYTHON) + ADD_SUBDIRECTORY(contrib/python-bindings/source) +ENDIF() IF(DEAL_II_HAVE_TESTS_DIRECTORY) ADD_SUBDIRECTORY(tests) diff --git a/contrib/python-bindings/include/cell_accessor_wrapper.h b/contrib/python-bindings/include/cell_accessor_wrapper.h index a3269c2588..695315e935 100644 --- a/contrib/python-bindings/include/cell_accessor_wrapper.h +++ b/contrib/python-bindings/include/cell_accessor_wrapper.h @@ -16,6 +16,10 @@ #ifndef dealii__cell_accessor_wrapper_h #define dealii__cell_accessor_wrapper_h +#include + +#ifdef DEAL_II_WITH_CXX11 + #include DEAL_II_NAMESPACE_OPEN @@ -136,3 +140,5 @@ namespace python DEAL_II_NAMESPACE_CLOSE #endif + +#endif diff --git a/contrib/python-bindings/include/point_wrapper.h b/contrib/python-bindings/include/point_wrapper.h index 75f3a01fe3..7c266fa007 100644 --- a/contrib/python-bindings/include/point_wrapper.h +++ b/contrib/python-bindings/include/point_wrapper.h @@ -17,6 +17,9 @@ #define dealii__point_wrapper_h #include + +#ifdef DEAL_II_WITH_CXX11 + #include DEAL_II_NAMESPACE_OPEN @@ -139,3 +142,5 @@ namespace python DEAL_II_NAMESPACE_CLOSE #endif + +#endif diff --git a/contrib/python-bindings/include/triangulation_wrapper.h b/contrib/python-bindings/include/triangulation_wrapper.h index 13b7367b9a..efd63e3cee 100644 --- a/contrib/python-bindings/include/triangulation_wrapper.h +++ b/contrib/python-bindings/include/triangulation_wrapper.h @@ -16,6 +16,10 @@ #ifndef dealii__triangulation_wrapper_h #define dealii__triangulation_wrapper_h +#include + +#ifdef DEAL_II_WITH_CXX11 + #include #include #include @@ -219,3 +223,5 @@ namespace python DEAL_II_NAMESPACE_CLOSE #endif + +#endif diff --git a/contrib/python-bindings/source/cell_accessor_wrapper.cc b/contrib/python-bindings/source/cell_accessor_wrapper.cc index fc3ba9bf54..3aa3495b1b 100644 --- a/contrib/python-bindings/source/cell_accessor_wrapper.cc +++ b/contrib/python-bindings/source/cell_accessor_wrapper.cc @@ -13,9 +13,12 @@ // // --------------------------------------------------------------------- +#include + +#ifdef DEAL_II_WITH_CXX11 + #include #include -#include #include DEAL_II_NAMESPACE_OPEN @@ -474,3 +477,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/export_cell_accessor.cc b/contrib/python-bindings/source/export_cell_accessor.cc index 52891c2dff..887b407307 100644 --- a/contrib/python-bindings/source/export_cell_accessor.cc +++ b/contrib/python-bindings/source/export_cell_accessor.cc @@ -17,6 +17,8 @@ #include #include +#ifdef DEAL_II_WITH_CXX11 + DEAL_II_NAMESPACE_OPEN namespace python @@ -107,3 +109,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/export_point.cc b/contrib/python-bindings/source/export_point.cc index e79c82c058..61b840fe82 100644 --- a/contrib/python-bindings/source/export_point.cc +++ b/contrib/python-bindings/source/export_point.cc @@ -14,6 +14,9 @@ // --------------------------------------------------------------------- #include + +#ifdef DEAL_II_WITH_CXX11 + #include #include #include @@ -36,3 +39,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/export_triangulation.cc b/contrib/python-bindings/source/export_triangulation.cc index d2cede42e4..3b6e3fb9f4 100644 --- a/contrib/python-bindings/source/export_triangulation.cc +++ b/contrib/python-bindings/source/export_triangulation.cc @@ -14,6 +14,9 @@ // --------------------------------------------------------------------- #include + +#ifdef DEAL_II_WITH_CXX11 + #include #include @@ -220,3 +223,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/point_wrapper.cc b/contrib/python-bindings/source/point_wrapper.cc index 833786b8d0..7d8e928498 100644 --- a/contrib/python-bindings/source/point_wrapper.cc +++ b/contrib/python-bindings/source/point_wrapper.cc @@ -14,6 +14,9 @@ // --------------------------------------------------------------------- #include + +#ifdef DEAL_II_WITH_CXX11 + #include DEAL_II_NAMESPACE_OPEN @@ -178,3 +181,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/triangulation_wrapper.cc b/contrib/python-bindings/source/triangulation_wrapper.cc index 84222ac863..39a27c6106 100644 --- a/contrib/python-bindings/source/triangulation_wrapper.cc +++ b/contrib/python-bindings/source/triangulation_wrapper.cc @@ -14,6 +14,9 @@ // --------------------------------------------------------------------- #include + +#ifdef DEAL_II_WITH_CXX11 + #include #include #include @@ -610,3 +613,5 @@ namespace python } DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/contrib/python-bindings/source/wrappers.cc b/contrib/python-bindings/source/wrappers.cc index dc09aa874b..e64fb1b7a9 100644 --- a/contrib/python-bindings/source/wrappers.cc +++ b/contrib/python-bindings/source/wrappers.cc @@ -14,6 +14,9 @@ // --------------------------------------------------------------------- #include + +#ifdef DEAL_II_WITH_CXX11 + #include DEAL_II_NAMESPACE_OPEN @@ -47,3 +50,5 @@ BOOST_PYTHON_MODULE(PyDealII) dealii::python::export_point(); dealii::python::export_triangulation(); } + +#endif