From 017c2d8e2b579feb2d3c0f1aa8901ace36a6d63d Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 2 Dec 2019 18:34:03 -0700 Subject: [PATCH] Remove references to old std_cxx1x namespace. --- include/deal.II/base/std_cxx11/array.h | 5 ----- include/deal.II/base/std_cxx11/bind.h | 6 ------ include/deal.II/base/std_cxx11/condition_variable.h | 5 ----- include/deal.II/base/std_cxx11/function.h | 6 ------ include/deal.II/base/std_cxx11/mutex.h | 5 ----- include/deal.II/base/std_cxx11/shared_ptr.h | 6 ------ include/deal.II/base/std_cxx11/thread.h | 5 ----- include/deal.II/base/std_cxx11/tuple.h | 5 ----- include/deal.II/base/std_cxx11/type_traits.h | 6 ------ include/deal.II/base/std_cxx11/unique_ptr.h | 5 ----- 10 files changed, 54 deletions(-) diff --git a/include/deal.II/base/std_cxx11/array.h b/include/deal.II/base/std_cxx11/array.h index f816134346..be2dcfd1ed 100644 --- a/include/deal.II/base/std_cxx11/array.h +++ b/include/deal.II/base/std_cxx11/array.h @@ -27,9 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/bind.h b/include/deal.II/base/std_cxx11/bind.h index 1070dd23f4..35b421664e 100644 --- a/include/deal.II/base/std_cxx11/bind.h +++ b/include/deal.II/base/std_cxx11/bind.h @@ -41,10 +41,4 @@ namespace std_cxx11 } // namespace std_cxx11 DEAL_II_NAMESPACE_CLOSE - -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/condition_variable.h b/include/deal.II/base/std_cxx11/condition_variable.h index d4d24024db..e71af5e907 100644 --- a/include/deal.II/base/std_cxx11/condition_variable.h +++ b/include/deal.II/base/std_cxx11/condition_variable.h @@ -29,9 +29,4 @@ namespace std_cxx11 } // namespace std_cxx11 DEAL_II_NAMESPACE_CLOSE -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/function.h b/include/deal.II/base/std_cxx11/function.h index a47fb2ba36..db9516034f 100644 --- a/include/deal.II/base/std_cxx11/function.h +++ b/include/deal.II/base/std_cxx11/function.h @@ -27,10 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE - -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/mutex.h b/include/deal.II/base/std_cxx11/mutex.h index 7823ece6f3..d89b6d6240 100644 --- a/include/deal.II/base/std_cxx11/mutex.h +++ b/include/deal.II/base/std_cxx11/mutex.h @@ -27,9 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/shared_ptr.h b/include/deal.II/base/std_cxx11/shared_ptr.h index 5b9faf1f30..abd4e85818 100644 --- a/include/deal.II/base/std_cxx11/shared_ptr.h +++ b/include/deal.II/base/std_cxx11/shared_ptr.h @@ -30,10 +30,4 @@ namespace std_cxx11 } // namespace std_cxx11 DEAL_II_NAMESPACE_CLOSE - -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/thread.h b/include/deal.II/base/std_cxx11/thread.h index 83c759a27d..56550b460e 100644 --- a/include/deal.II/base/std_cxx11/thread.h +++ b/include/deal.II/base/std_cxx11/thread.h @@ -27,9 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/tuple.h b/include/deal.II/base/std_cxx11/tuple.h index 11b897ead7..4041e87015 100644 --- a/include/deal.II/base/std_cxx11/tuple.h +++ b/include/deal.II/base/std_cxx11/tuple.h @@ -31,9 +31,4 @@ namespace std_cxx11 } // namespace std_cxx11 DEAL_II_NAMESPACE_CLOSE -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/type_traits.h b/include/deal.II/base/std_cxx11/type_traits.h index ac2c83e4b6..389cf2ce9d 100644 --- a/include/deal.II/base/std_cxx11/type_traits.h +++ b/include/deal.II/base/std_cxx11/type_traits.h @@ -36,10 +36,4 @@ namespace std_cxx11 } // namespace std_cxx11 DEAL_II_NAMESPACE_CLOSE - -// 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 - #endif diff --git a/include/deal.II/base/std_cxx11/unique_ptr.h b/include/deal.II/base/std_cxx11/unique_ptr.h index 71e5707ee0..6c26b37c15 100644 --- a/include/deal.II/base/std_cxx11/unique_ptr.h +++ b/include/deal.II/base/std_cxx11/unique_ptr.h @@ -27,9 +27,4 @@ namespace std_cxx11 } DEAL_II_NAMESPACE_CLOSE -// 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 - #endif -- 2.39.5