Fix an oversight in the previous patch in which we did not put stuff into the correct...

diff --git a/include/deal.II/base/std_cxx1x/array.h b/include/deal.II/base/std_cxx1x/array.h
index 326a74e5f440266d0960d4375ce98f1fcc458fda..05d811b05d00a0f95eb954ef178e081834e84655 100644 (file)
--- 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 23efb3ad5d857b78078b9f71131ee952dcf96ecd..66571467eb35eb324a3d7bfab31a37158699b34c 100644 (file)
--- 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 dcfa4174cf7a29978a1c0ffbe2113fa6cb9d8477..de7cfda7f90b4c73f75192bedb36c00f934a172d 100644 (file)
--- 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 323ec322773cf1188f1d5c5d4021ebdfcf481c4c..0f435f9bac440ea508aed1840d22741636eb3053 100644 (file)
--- 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 a68030ce8060e339c99abc495c5c7eaf3fc7a132..6ac9ca2ca69214f2b6b9b5b37c04d83eb5fad7c7 100644 (file)
--- 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 d7976138596ad8aab49653f05fc4fc446fdbbc79..fe19b30be2ff35ee7504db5c2c58175accb83d0d 100644 (file)
--- 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 16c428db0c2179479143abde5ebde6e7cda16d4c..844ceae3e4fc8ca9818b52cb4169aeffbce2a18a 100644 (file)
--- 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 162ee54a3cf848d5dadd9ede310546a8c1769f34..cf63fa109b936cb8cff1f109fff1865c0c7cb76b 100644 (file)
--- 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 aba163a53539b5645e4b5f53bb7e173fceeab7aa..0d0ac21eb079dd033812e5fb204845c59ee886e4 100644 (file)
--- 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