Also import the DataOutBase::Patch name into DataOutInterface to make MS VC

happy.

Fix a couple of minor editorial warts.

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

diff --git a/deal.II/include/deal.II/base/data_out_base.h b/deal.II/include/deal.II/base/data_out_base.h
index db413f05fdc5668eaeeb7eb8cb68bad359fa4674..0d9ee2bbf387e735a1a46b8e6b486ca7b2ffd61e 100644 (file)
--- a/deal.II/include/deal.II/base/data_out_base.h
+++ b/deal.II/include/deal.II/base/data_out_base.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1087,11 +1087,8 @@ public:
      * of an STL <tt>std::map</tt> type with a certain number of
      * elements?), this is only an estimate. however often quite close
      * to the true value.
-    */
+     */
     std::size_t memory_consumption () const;
-
-  private:
-
   };
 
 
@@ -1111,6 +1108,7 @@ public:
      * understand.
      */
     static const unsigned int format_version = 3;
+    
   private:
     /**
      * Dummy entry to suppress compiler warnings when copying an empty
@@ -2308,6 +2306,8 @@ public:
   using DataOutBase::get_output_format_names;
   using DataOutBase::determine_intermediate_format_dimensions;
 
+  using DataOutBase::Patch;
+  
   /**
    * Constructor.
    */