From 087c32340aae7f7c8649032d39271b56ab2c71b7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 22 Jan 2001 09:29:52 +0000 Subject: [PATCH] Minor std::, typename changes and the like. git-svn-id: https://svn.dealii.org/trunk@3747 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/quadrature.cc | 2 +- deal.II/deal.II/include/grid/tria_boundary.h | 8 ++++---- deal.II/lac/include/lac/full_matrix.templates.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 3e0e04f3f3..d3027431ac 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -320,7 +320,7 @@ template <> void QProjector<1>::project_to_subface (const Quadrature<0> &, const unsigned int, const unsigned int, - vector > &) + std::vector > &) { Assert(false, ExcNotImplemented()); } diff --git a/deal.II/deal.II/include/grid/tria_boundary.h b/deal.II/deal.II/include/grid/tria_boundary.h index 3bc68198c3..689b0be07c 100644 --- a/deal.II/deal.II/include/grid/tria_boundary.h +++ b/deal.II/deal.II/include/grid/tria_boundary.h @@ -137,7 +137,7 @@ class Boundary : public Subscriptor */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - vector > &points) const; + typename std::vector > &points) const; /** * Return intermediate points @@ -166,7 +166,7 @@ class Boundary : public Subscriptor */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - vector > &points) const; + typename std::vector > &points) const; /** * Exception. @@ -236,7 +236,7 @@ class StraightBoundary : public Boundary { */ virtual void get_intermediate_points_on_line (const typename Triangulation::line_iterator &line, - vector > &points) const; + typename std::vector > &points) const; /** * Gives @p{n=points.size()=m*m} @@ -251,7 +251,7 @@ class StraightBoundary : public Boundary { */ virtual void get_intermediate_points_on_quad (const typename Triangulation::quad_iterator &quad, - vector > &points) const; + typename std::vector > &points) const; }; diff --git a/deal.II/lac/include/lac/full_matrix.templates.h b/deal.II/lac/include/lac/full_matrix.templates.h index 4fc1d5ecce..477778d13b 100644 --- a/deal.II/lac/include/lac/full_matrix.templates.h +++ b/deal.II/lac/include/lac/full_matrix.templates.h @@ -59,7 +59,7 @@ FullMatrix::FullMatrix (const unsigned int m, reinit (m,n); if (dim_range*dim_image != 0) - copy (entries, entries+dim_image*dim_range, val); + std::copy (entries, entries+dim_image*dim_range, val); }; @@ -1338,11 +1338,11 @@ FullMatrix::print_formatted (std::ostream &out, unsigned int actual_width = width; if (scientific) { - out.setf (ios::scientific, ios::floatfield); + out.setf (std::ios::scientific, std::ios::floatfield); if (!width) actual_width = precision+7; } else { - out.setf (ios::fixed, ios::floatfield); + out.setf (std::ios::fixed, std::ios::floatfield); if (!width) actual_width = precision+2; } -- 2.39.5