From: Wolfgang Bangerth Date: Sun, 18 Jul 2010 19:47:22 +0000 (+0000) Subject: Don't use 'using namespace std;'. As it turns out, this wasn't necessary in these... X-Git-Tag: v8.0.0~5798 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b1f27b897a30d26b96ecca32152f800778ba4e;p=dealii.git Don't use 'using namespace std;'. As it turns out, this wasn't necessary in these files anyway. git-svn-id: https://svn.dealii.org/trunk@21525 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/flow_function.cc b/deal.II/base/source/flow_function.cc index f26c846cf3..535b4b916c 100644 --- a/deal.II/base/source/flow_function.cc +++ b/deal.II/base/source/flow_function.cc @@ -19,7 +19,6 @@ #include -using namespace std; DEAL_II_NAMESPACE_OPEN diff --git a/deal.II/base/source/function_lib_cutoff.cc b/deal.II/base/source/function_lib_cutoff.cc index 480a282a13..4eaebd5846 100644 --- a/deal.II/base/source/function_lib_cutoff.cc +++ b/deal.II/base/source/function_lib_cutoff.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -24,11 +24,6 @@ DEAL_II_NAMESPACE_OPEN namespace Functions { - - using namespace std; - - - template CutOffFunctionBase::CutOffFunctionBase (const double r, const Point p, @@ -58,7 +53,7 @@ namespace Functions } ////////////////////////////////////////////////////////////////////// - + template CutOffFunctionLinfty::CutOffFunctionLinfty (const double r, const Point p, @@ -83,7 +78,7 @@ namespace Functions template - void + void CutOffFunctionLinfty::value_list (const std::vector > &points, std::vector &values, const unsigned int component) const @@ -92,7 +87,7 @@ namespace Functions ExcDimensionMismatch(values.size(), points.size())); Assert (component < this->n_components, ExcIndexRange(component,0,this->n_components)); - + if (this->selected==CutOffFunctionBase::no_component || @@ -103,7 +98,7 @@ namespace Functions std::fill (values.begin(), values.end(), 0.); } - + template void CutOffFunctionLinfty::vector_value_list ( @@ -126,7 +121,7 @@ namespace Functions } } } - + template CutOffFunctionW1::CutOffFunctionW1 (const double r, @@ -150,19 +145,19 @@ namespace Functions const double d = this->center.distance(p); return ((dradius) ? (this->radius-d) : 0.); } - return 0.; + return 0.; } template - void + void CutOffFunctionW1::value_list (const std::vector > &points, std::vector &values, const unsigned int component) const { Assert (values.size() == points.size(), ExcDimensionMismatch(values.size(), points.size())); - + if (this->selected==CutOffFunctionBase::no_component || component==this->selected) @@ -200,7 +195,7 @@ namespace Functions } } } - + template CutOffFunctionCinfty::CutOffFunctionCinfty (const double r, @@ -230,17 +225,17 @@ namespace Functions } return 0.; } - + template - void + void CutOffFunctionCinfty::value_list (const std::vector > &points, std::vector &values, const unsigned int component) const { Assert (values.size() == points.size(), ExcDimensionMismatch(values.size(), points.size())); - + const double r = this->radius; if (this->selected==CutOffFunctionBase::no_component @@ -293,7 +288,7 @@ namespace Functions } } } - + template @@ -310,17 +305,17 @@ namespace Functions Point() : (p-this->center)/d*(-2.0*r*r/pow(-r*r+d*d,2.0)*d*exp(e))); } - -// explicit instantiations + +// explicit instantiations template class CutOffFunctionLinfty <1>; template class CutOffFunctionLinfty <2>; template class CutOffFunctionLinfty <3>; - + template class CutOffFunctionW1 <1>; template class CutOffFunctionW1 <2>; template class CutOffFunctionW1 <3>; - + template class CutOffFunctionCinfty <1>; template class CutOffFunctionCinfty <2>; template class CutOffFunctionCinfty <3>;