From: wolf Date: Wed, 12 Jun 2002 13:11:10 +0000 (+0000) Subject: Since DataOutBase is a private base class of DataOutInterface, which itself is a... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50f1951c7b091842587de87082adb242a7a697ba;p=dealii-svn.git Since DataOutBase is a private base class of DataOutInterface, which itself is a base class to DataOut*, we cannot reference the Patch local class using DataOutBase::Patch, since there private inheritance comes into play. However, since Patch is a public type, use ::DataOutBase::Patch, to indicate that we access it from outside, rather than through the inheritance tree. git-svn-id: https://svn.dealii.org/trunk@6078 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/data_out.h b/deal.II/deal.II/include/numerics/data_out.h index 901d3d5905..0cc2ad93f9 100644 --- a/deal.II/deal.II/include/numerics/data_out.h +++ b/deal.II/deal.II/include/numerics/data_out.h @@ -464,7 +464,7 @@ class DataOut_DoFData : public DataOutInterface * Abbreviate the somewhat lengthy * name for the @p{Patch} class. */ - typedef typename DataOutBase::Patch Patch; + typedef ::DataOutBase::Patch Patch; /** * Pointer to the dof handler object. @@ -645,7 +645,7 @@ class DataOut : public DataOut_DoFData * for finding neighbors. */ typedef std::map::cell_iterator, - typename std::vector >::iterator> + typename std::vector<::DataOutBase::Patch >::iterator> PatchMap; /** diff --git a/deal.II/deal.II/include/numerics/data_out_stack.h b/deal.II/deal.II/include/numerics/data_out_stack.h index 9cbed62642..71bfa844c7 100644 --- a/deal.II/deal.II/include/numerics/data_out_stack.h +++ b/deal.II/deal.II/include/numerics/data_out_stack.h @@ -367,7 +367,7 @@ class DataOutStack : public DataOutInterface * List of patches of all past and * present parameter value data sets. */ - typename std::vector > patches; + typename std::vector<::DataOutBase::Patch > patches; /** * Structure holding data vectors @@ -413,7 +413,7 @@ class DataOutStack : public DataOutInterface * the base class @ref{DataOutBase}) to * the actual output function. */ - virtual const typename std::vector > & get_patches () const; + virtual const typename std::vector<::DataOutBase::Patch > & get_patches () const; /** diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index e821f1f039..321440ee07 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -309,7 +309,7 @@ DataOut_DoFData::get_dataset_names () template -const typename std::vector > & +const typename std::vector<::DataOutBase::Patch > & DataOut_DoFData::get_patches () const { return patches; @@ -352,7 +352,7 @@ void DataOut::build_some_patches (Data data) const unsigned int n_q_points = patch_points.n_quadrature_points; unsigned int cell_number = 0; - typename std::vector >::iterator patch = this->patches.begin(); + typename std::vector<::DataOutBase::Patch >::iterator patch = this->patches.begin(); typename DoFHandler::cell_iterator cell=first_cell(); // get first cell in this thread @@ -478,7 +478,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // clear the patches array if (true) { - typename std::vector > dummy; + typename std::vector<::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -519,7 +519,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // or similar operations are used // which would regularly overflow // the allocated amount of memory - DataOutBase::Patch default_patch; + ::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points); this->patches.insert (patches.end(), n_patches, default_patch); @@ -542,7 +542,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // First, number patches // consecutively. unsigned int patch_no = 0; - for (typename std::vector >::iterator + for (typename std::vector<::DataOutBase::Patch >::iterator patch = patches.begin(); patch != patches.end(); ++patch) patch->me = patch_no++; @@ -556,7 +556,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, { const typename DoFHandler::cell_iterator cell = map_entry->first; - const typename std::vector >::iterator + const typename std::vector<::DataOutBase::Patch >::iterator patch = map_entry->second; // loop over all faces and see @@ -580,7 +580,7 @@ void DataOut::build_patches (const unsigned int n_subdivisions, // if there is a neighbor, // get its patch... const typename - std::vector >::iterator + std::vector<::DataOutBase::Patch >::iterator neighbor_patch = patch_map.find(cell->neighbor(i))->second; // ...and set its neighbor // pointer set diff --git a/deal.II/deal.II/source/numerics/data_out_faces.cc b/deal.II/deal.II/source/numerics/data_out_faces.cc index def79752d2..f23c6fe3f2 100644 --- a/deal.II/deal.II/source/numerics/data_out_faces.cc +++ b/deal.II/deal.II/source/numerics/data_out_faces.cc @@ -49,7 +49,7 @@ void DataOutFaces::build_some_patches (Data data) const unsigned int n_q_points = patch_points.n_quadrature_points; unsigned int face_number = 0; - typename std::vector >::iterator patch = this->patches.begin(); + typename std::vector<::DataOutBase::Patch >::iterator patch = this->patches.begin(); FaceDescriptor face=first_face(); // get first face in this thread @@ -173,7 +173,7 @@ void DataOutFaces::build_patches (const unsigned int n_subdivisions, // clear the patches array if (true) { - std::vector > dummy; + std::vector<::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -207,7 +207,7 @@ void DataOutFaces::build_patches (const unsigned int n_subdivisions, // values. note that the evaluation // points on the face have to be // repeated in angular direction - DataOutBase::Patch default_patch; + ::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points); this->patches.insert (patches.end(), n_patches, default_patch); diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index af25b60100..3d318788f1 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -78,7 +78,7 @@ void DataOutRotation::build_some_patches (Data data) unsigned int cell_number = 0; - typename std::vector >::iterator patch = this->patches.begin(); + typename std::vector<::DataOutBase::Patch >::iterator patch = this->patches.begin(); typename DoFHandler::cell_iterator cell=first_cell(); // get first cell in this thread @@ -351,7 +351,7 @@ void DataOutRotation::build_patches (const unsigned int n_patches_per_circl // clear the patches array if (true) { - std::vector > dummy; + std::vector<::DataOutBase::Patch > dummy; this->patches.swap (dummy); }; @@ -392,7 +392,7 @@ void DataOutRotation::build_patches (const unsigned int n_patches_per_circl // values. note that the evaluation // points on the cell have to be // repeated in angular direction - DataOutBase::Patch default_patch; + ::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points * (n_subdivisions+1)); diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index ba1b5f0a0b..816bbb131b 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -240,14 +240,14 @@ void DataOutStack::build_patches (const unsigned int n_subdivisions) Vector(n_components)); // add the required number of patches - DataOutBase::Patch default_patch; + ::DataOutBase::Patch default_patch; default_patch.n_subdivisions = n_subdivisions; default_patch.data.reinit (n_datasets, n_q_points*(n_subdivisions+1)); patches.insert (patches.end(), n_patches, default_patch); // now loop over all cells and // actually create the patches - typename std::vector >::iterator + typename std::vector<::DataOutBase::Patch >::iterator patch = patches.begin() + (patches.size()-n_patches); unsigned int cell_number = 0; for (typename DoFHandler::active_cell_iterator cell=dof_handler->begin_active(); @@ -355,7 +355,7 @@ DataOutStack::memory_consumption () const template -const typename std::vector > & +const typename std::vector<::DataOutBase::Patch > & DataOutStack::get_patches () const { return patches;