Reimport a few symbols through using-declarations.

git-svn-id: https://svn.dealii.org/trunk@11047 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h
index 9d24ed78cf396ce1b921a7b75d5e631fdc847eda..e72297d49d6ba6313c8c65d33878dcec5e7ee6e5 100644 (file)
--- a/deal.II/base/include/base/data_out_base.h
+++ b/deal.II/base/include/base/data_out_base.h
@@ -1921,6 +1921,20 @@ template <int dim, int spacedim=dim>
 class DataOutInterface : private DataOutBase
 {
   public:
+                                     /**
+                                      * Import a few names that were
+                                      * previously in this class and have then
+                                      * moved to the base class. Since the
+                                      * base class is inherited from
+                                      * privately, we need to re-import these
+                                      * symbols to make sure that references
+                                      * to DataOutInterface<dim,spacedim>::XXX
+                                      * remain valid.
+                                      */
+    using DataOutBase::OutputFormat;
+    using DataOutBase::parse_output_format;
+    using DataOutBase::get_output_format_names;
+    
                                      /**
                                       * Destructor. Does nothing, but is
                                       * declared virtual since this class has