Move declarations in DoFHandler from protected to private.

DoFHandler still had some of its member variables and functions in a protected
section from back when we still had MGDoFHandler derive from it in a meaningful
way. This is now no longer necessary, so remove the protected section and instead
sort things in some sort of natural way into the private section.

diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h
index 94d7e3169a11d335a5422b07d55a8b30b55e8431..494ac69be673b0ba913e598633d8791474610a64 100644 (file)
--- a/include/deal.II/dofs/dof_handler.h
+++ b/include/deal.II/dofs/dof_handler.h
@@ -753,7 +753,6 @@ public:
    * @ingroup CPP11
    */
   IteratorRange<level_cell_iterator> mg_cell_iterators_on_level (const unsigned int level) const;
-
   //@}
 
   /*---------------------------------------*/
@@ -1066,21 +1065,35 @@ public:
                   << ", but this level is empty.");
 
 
-protected:
+private:
   /**
-   * The object containing
-   * information on the block structure.
+   * Copy constructor. I can see no reason
+   * why someone might want to use it, so
+   * I don't provide it. Since this class
+   * has pointer members, making it private
+   * prevents the compiler to provide it's
+   * own, incorrect one if anyone chose to
+   * copy such an object.
    */
-  BlockInfo block_info_object;
+  DoFHandler (const DoFHandler &);
 
   /**
-   * Array to store the indices for
-   * degrees of freedom located at
-   * vertices.
+   * Copy operator. I can see no reason
+   * why someone might want to use it, so
+   * I don't provide it. Since this class
+   * has pointer members, making it private
+   * prevents the compiler to provide it's
+   * own, incorrect one if anyone chose to
+   * copy such an object.
    */
-  std::vector<types::global_dof_index>      vertex_dofs;
+  DoFHandler &operator = (const DoFHandler &);
 
 
+  /**
+   * An object containing
+   * information on the block structure.
+   */
+  BlockInfo block_info_object;
 
   /**
    * Address of the triangulation to
@@ -1125,34 +1138,10 @@ protected:
   dealii::internal::DoFHandler::NumberCache number_cache;
 
   /**
-   * Datastructure like number_cache, but for each Multigrid level.
+   * Data structure like number_cache, but for each multigrid level.
    */
   std::vector<dealii::internal::DoFHandler::NumberCache> mg_number_cache;
 
-private:
-
-  /**
-   * Copy constructor. I can see no reason
-   * why someone might want to use it, so
-   * I don't provide it. Since this class
-   * has pointer members, making it private
-   * prevents the compiler to provide it's
-   * own, incorrect one if anyone chose to
-   * copy such an object.
-   */
-  DoFHandler (const DoFHandler &);
-
-  /**
-   * Copy operator. I can see no reason
-   * why someone might want to use it, so
-   * I don't provide it. Since this class
-   * has pointer members, making it private
-   * prevents the compiler to provide it's
-   * own, incorrect one if anyone chose to
-   * copy such an object.
-   */
-  DoFHandler &operator = (const DoFHandler &);
-
   /**
    * A data structure that is used to store the DoF indices associated with
    * a particular vertex. Unlike cells, vertices live on several levels of
@@ -1257,6 +1246,19 @@ private:
   template<int structdim>
   void set_dof_index (const unsigned int obj_level, const unsigned int obj_index, const unsigned int fe_index, const unsigned int local_index, const types::global_dof_index global_index) const;
 
+  /**
+   * Array to store the indices for
+   * degrees of freedom located at
+   * vertices.
+   */
+  std::vector<types::global_dof_index> vertex_dofs;
+
+  /**
+   * An array to store the indices for level degrees of freedom located
+   * at vertices.
+   */
+  std::vector<MGVertexDoFs> mg_vertex_dofs;
+
   /**
    * Space to store the DoF numbers
    * for the different
@@ -1280,8 +1282,6 @@ private:
 
   dealii::internal::DoFHandler::DoFFaces<dim> *mg_faces;
 
-  std::vector<MGVertexDoFs> mg_vertex_dofs;
-
   /**
    * Make accessor objects friends.
    */