From 230d99e4c6d168f8cac11fc71b7fc308b67c9d89 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 1 Sep 2014 19:21:20 -0500 Subject: [PATCH] Fix an oversight in the previous patch in which we did not put stuff into the correct namespace. --- include/deal.II/base/std_cxx1x/array.h | 2 ++ include/deal.II/base/std_cxx1x/bind.h | 2 ++ include/deal.II/base/std_cxx1x/condition_variable.h | 2 ++ include/deal.II/base/std_cxx1x/function.h | 2 ++ include/deal.II/base/std_cxx1x/mutex.h | 2 ++ include/deal.II/base/std_cxx1x/shared_ptr.h | 2 ++ include/deal.II/base/std_cxx1x/thread.h | 2 ++ include/deal.II/base/std_cxx1x/tuple.h | 2 ++ include/deal.II/base/std_cxx1x/type_traits.h | 3 ++- 9 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/deal.II/base/std_cxx1x/array.h b/include/deal.II/base/std_cxx1x/array.h index 326a74e5f4..05d811b05d 100644 --- a/include/deal.II/base/std_cxx1x/array.h +++ b/include/deal.II/base/std_cxx1x/array.h @@ -18,4 +18,6 @@ #include "../std_cxx11/array.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/bind.h b/include/deal.II/base/std_cxx1x/bind.h index 23efb3ad5d..66571467eb 100644 --- a/include/deal.II/base/std_cxx1x/bind.h +++ b/include/deal.II/base/std_cxx1x/bind.h @@ -18,4 +18,6 @@ #include "../std_cxx11/bind.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/condition_variable.h b/include/deal.II/base/std_cxx1x/condition_variable.h index dcfa4174cf..de7cfda7f9 100644 --- a/include/deal.II/base/std_cxx1x/condition_variable.h +++ b/include/deal.II/base/std_cxx1x/condition_variable.h @@ -18,4 +18,6 @@ #include "../std_cxx11/condition_variable.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/function.h b/include/deal.II/base/std_cxx1x/function.h index 323ec32277..0f435f9bac 100644 --- a/include/deal.II/base/std_cxx1x/function.h +++ b/include/deal.II/base/std_cxx1x/function.h @@ -18,4 +18,6 @@ #include "../std_cxx11/function.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/mutex.h b/include/deal.II/base/std_cxx1x/mutex.h index a68030ce80..6ac9ca2ca6 100644 --- a/include/deal.II/base/std_cxx1x/mutex.h +++ b/include/deal.II/base/std_cxx1x/mutex.h @@ -18,4 +18,6 @@ #include "../std_cxx11/mutex.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/shared_ptr.h b/include/deal.II/base/std_cxx1x/shared_ptr.h index d797613859..fe19b30be2 100644 --- a/include/deal.II/base/std_cxx1x/shared_ptr.h +++ b/include/deal.II/base/std_cxx1x/shared_ptr.h @@ -18,4 +18,6 @@ #include "../std_cxx11/shared_ptr.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/thread.h b/include/deal.II/base/std_cxx1x/thread.h index 16c428db0c..844ceae3e4 100644 --- a/include/deal.II/base/std_cxx1x/thread.h +++ b/include/deal.II/base/std_cxx1x/thread.h @@ -18,4 +18,6 @@ #include "../std_cxx11/thread.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/tuple.h b/include/deal.II/base/std_cxx1x/tuple.h index 162ee54a3c..cf63fa109b 100644 --- a/include/deal.II/base/std_cxx1x/tuple.h +++ b/include/deal.II/base/std_cxx1x/tuple.h @@ -18,4 +18,6 @@ #include "../std_cxx11/tuple.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; +DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/base/std_cxx1x/type_traits.h b/include/deal.II/base/std_cxx1x/type_traits.h index aba163a535..0d0ac21eb0 100644 --- a/include/deal.II/base/std_cxx1x/type_traits.h +++ b/include/deal.II/base/std_cxx1x/type_traits.h @@ -18,5 +18,6 @@ #include "../std_cxx11/type_traits.h" // then allow using the old namespace name instead of the new one +DEAL_II_NAMESPACE_OPEN namespace std_cxx1x = std_cxx11; - +DEAL_II_NAMESPACE_CLOSE -- 2.39.5