From: third-party Date: Mon, 22 Jan 2001 13:46:40 +0000 (+0000) Subject: More std:: and typename stuff X-Git-Tag: v8.0.0~19794 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ca983a9c1d205477570aa0ef7a75f9ef3626cf;p=dealii.git More std:: and typename stuff git-svn-id: https://svn.dealii.org/trunk@3757 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/grid/tria_boundary_lib.h b/deal.II/deal.II/include/grid/tria_boundary_lib.h index 1cda4fe87e..a0e52fda18 100644 --- a/deal.II/deal.II/include/grid/tria_boundary_lib.h +++ b/deal.II/deal.II/include/grid/tria_boundary_lib.h @@ -67,7 +67,7 @@ class HyperBallBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - vector > &points) const; + typename std::vector > &points) const; /** * Refer to the general documentation of @@ -79,7 +79,7 @@ class HyperBallBoundary : public StraightBoundary */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - vector > &points) const; + typename std::vector > &points) const; /** * Return the center of the ball. diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index eb8b1fa606..b7d9817f2f 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -1161,7 +1161,7 @@ unsigned int DoFHandler<1>::n_boundary_dofs (const FunctionMap &) const template <> -unsigned int DoFHandler<1>::n_boundary_dofs (const set &) const +unsigned int DoFHandler<1>::n_boundary_dofs (const std::set &) const { Assert (selected_fe != 0, ExcNoFESelected()); Assert (false, ExcNotImplemented()); diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index f285723bf1..7141a1e5f0 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1628,7 +1628,7 @@ void DoFTools::map_dof_to_boundary_indices (const DoFHandler<1> &dof_handler, template <> void DoFTools::map_dof_to_boundary_indices (const DoFHandler<1> &dof_handler, - const set &, + const std::set &, std::vector &) { Assert (&dof_handler.get_fe() != 0, ExcNoFESelected()); diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index 002ced7f75..c8e63c0a28 100644 --- a/deal.II/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/deal.II/source/grid/tria_boundary.cc @@ -37,7 +37,7 @@ template void Boundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &, - vector > &) const + std::vector > &) const { Assert (false, ExcPureVirtualFunctionCalled()); }; @@ -47,7 +47,7 @@ template void Boundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, - vector > &) const + std::vector > &) const { Assert (false, ExcPureVirtualFunctionCalled()); }; @@ -96,7 +96,7 @@ template void StraightBoundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &, - vector > &) const + typename std::vector > &) const { Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); } @@ -108,7 +108,7 @@ template void StraightBoundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &line, - vector > &points) const + typename std::vector > &points) const { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); @@ -128,7 +128,7 @@ template void StraightBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &, - vector > &) const + typename std::vector > &) const { Assert(false, typename Boundary::ExcFunctionNotUseful(dim)); } @@ -139,7 +139,7 @@ template void StraightBoundary::get_intermediate_points_on_quad ( const typename Triangulation::quad_iterator &quad, - vector > &points) const + typename std::vector > &points) const { const unsigned int n=points.size(), m=static_cast(sqrt(n)); diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc index 122725071d..23012394ae 100644 --- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc +++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc @@ -81,7 +81,7 @@ template <> void HyperBallBoundary<2>::get_intermediate_points_on_line ( const Triangulation<2>::line_iterator &line, - vector > &points) const + std::vector > &points) const { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); @@ -119,7 +119,7 @@ template void HyperBallBoundary::get_intermediate_points_on_line ( const typename Triangulation::line_iterator &, - vector > &) const + typename std::vector > &) const { Assert(false, ExcNotImplemented()); } @@ -131,7 +131,7 @@ template <> void HyperBallBoundary<3>::get_intermediate_points_on_quad ( const Triangulation<3>::quad_iterator &quad, - vector > &points) const + std::vector > &points) const { Assert(points.size()==1, ExcNotImplemented()); StraightBoundary<3>::get_intermediate_points_on_quad (quad, points); @@ -151,7 +151,7 @@ template void HyperBallBoundary::get_intermediate_points_on_quad ( const Triangulation::quad_iterator &, - vector > &) const + typename std::vector > &) const { Assert(false,ExcNotImplemented()); } diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index e4eafb87f2..4e4198eaae 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include