From: Wolfgang Bangerth Date: Mon, 14 Feb 2000 10:27:19 +0000 (+0000) Subject: Re-concat lines that ended in ::. They were split in the first since Doc++ had proble... X-Git-Tag: v8.0.0~20960 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48fcf4d2f86b0609323fe588f645ca208028b5b;p=dealii.git Re-concat lines that ended in ::. They were split in the first since Doc++ had problems understanding these declarations, but the newer versions now get it right. Furthermore, kdoc now has problems with them. git-svn-id: https://svn.dealii.org/trunk@2400 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index ee191480e5..a50cd00d80 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -177,7 +177,7 @@ class LogStream * be prepended by the user time used * by the running program so far. */ - void log_execution_time(bool flag); + void log_execution_time(bool flag); /** * Output a constant something through @@ -236,8 +236,7 @@ private: template inline LogStream & -LogStream:: -operator<< (const T& t) +LogStream::operator<< (const T& t) { // if the previous command was an // #endl#, print the topmost prefix diff --git a/deal.II/base/include/base/tensor.h b/deal.II/base/include/base/tensor.h index 8651b84b76..9528404739 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -191,7 +191,8 @@ class Tensor template inline -Tensor::Tensor () { +Tensor::Tensor () +{ // default constructor. not specifying an initializer list calls // the default constructor of the subobjects, which initialize them // selves. therefore, the tensor is set to zero this way @@ -201,7 +202,8 @@ Tensor::Tensor () { template inline -Tensor::Tensor (const array_type &initializer) { +Tensor::Tensor (const array_type &initializer) +{ for (unsigned int i=0; i(initializer[i]); }; @@ -212,8 +214,8 @@ Tensor::Tensor (const array_type &initializer) { template inline Tensor & -Tensor:: -operator[] (const unsigned int i) { +Tensor::operator[] (const unsigned int i) +{ Assert (i inline const Tensor & -Tensor:: -operator[] (const unsigned int i) const { +Tensor::operator[] (const unsigned int i) const +{ Assert (i inline Tensor & -Tensor:: -operator = (const Tensor &t) { +Tensor::operator = (const Tensor &t) +{ for (unsigned int i=0; i &t) { template inline bool -Tensor:: -operator == (const Tensor &p) const { +Tensor::operator == (const Tensor &p) const +{ for (unsigned int i=0; i &p) const { template inline bool -Tensor:: -operator != (const Tensor &p) const { +Tensor::operator != (const Tensor &p) const +{ return !((*this) == p); }; @@ -270,8 +272,8 @@ operator != (const Tensor &p) const { template inline Tensor & -Tensor:: -operator += (const Tensor &p) { +Tensor::operator += (const Tensor &p) +{ for (unsigned int i=0; i &p) { template inline Tensor & -Tensor:: -operator -= (const Tensor &p) { +Tensor::operator -= (const Tensor &p) +{ for (unsigned int i=0; i &p) { template inline Tensor & -Tensor:: -operator *= (const double &s) { +Tensor::operator *= (const double &s) +{ for (unsigned int i=0; i inline Tensor & -Tensor:: -operator /= (const double &s) { +Tensor::operator /= (const double &s) +{ for (unsigned int i=0; i inline Tensor -Tensor:: -operator + (const Tensor &t) const { +Tensor::operator + (const Tensor &t) const +{ Tensor tmp(*this); for (unsigned int i=0; i &t) const { template inline Tensor -Tensor:: -operator - (const Tensor &t) const { +Tensor::operator - (const Tensor &t) const +{ Tensor tmp(*this); for (unsigned int i=0; i &t) const { template inline -void Tensor::clear () { +void Tensor::clear () +{ for (unsigned int i=0; i &p); template inline -Tensor<1,dim>::Tensor (const bool initialize) { +Tensor<1,dim>::Tensor (const bool initialize) +{ Assert (dim>0, ExcDimTooSmall(dim)); if (initialize) @@ -272,7 +273,8 @@ Tensor<1,dim>::Tensor (const bool initialize) { template inline -Tensor<1,dim>::Tensor (const array_type &initializer) { +Tensor<1,dim>::Tensor (const array_type &initializer) +{ for (unsigned int i=0; i::Tensor (const array_type &initializer) { template inline -Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) { +Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) +{ for (unsigned int i=0; i::Tensor (const Tensor<1,dim> &p) { template inline -double Tensor<1,dim>:: -operator [] (const unsigned int index) const { +double Tensor<1,dim>::operator [] (const unsigned int index) const +{ Assert (index inline -double & Tensor<1,dim>:: -operator [] (const unsigned int index) { +double & Tensor<1,dim>::operator [] (const unsigned int index) +{ Assert (index inline -Tensor<1,dim> & Tensor<1,dim>:: -operator = (const Tensor<1,dim> &p) { +Tensor<1,dim> & Tensor<1,dim>::operator = (const Tensor<1,dim> &p) +{ for (unsigned int i=0; i &p) { template inline -bool Tensor<1,dim>:: -operator == (const Tensor<1,dim> &p) const { +bool Tensor<1,dim>::operator == (const Tensor<1,dim> &p) const +{ for (unsigned int i=0; i &p) const { template inline -bool Tensor<1,dim>:: -operator != (const Tensor<1,dim> &p) const { +bool Tensor<1,dim>::operator != (const Tensor<1,dim> &p) const +{ return !((*this) == p); }; @@ -341,8 +344,8 @@ operator != (const Tensor<1,dim> &p) const { template inline -Tensor<1,dim> & Tensor<1,dim>:: -operator += (const Tensor<1,dim> &p) { +Tensor<1,dim> & Tensor<1,dim>::operator += (const Tensor<1,dim> &p) +{ for (unsigned int i=0; i &p) { template inline -Tensor<1,dim> & Tensor<1,dim>:: -operator -= (const Tensor<1,dim> &p) { +Tensor<1,dim> & Tensor<1,dim>::operator -= (const Tensor<1,dim> &p) +{ for (unsigned int i=0; i &p) { template inline -Tensor<1,dim> & Tensor<1,dim>:: -operator *= (const double &s) { +Tensor<1,dim> & Tensor<1,dim>::operator *= (const double &s) +{ for (unsigned int i=0; i inline -Tensor<1,dim> & Tensor<1,dim>:: -operator /= (const double &s) { +Tensor<1,dim> & Tensor<1,dim>::operator /= (const double &s) +{ for (unsigned int i=0; i inline -double Tensor<1,dim>:: -operator * (const Tensor<1,dim> &p) const { +double Tensor<1,dim>::operator * (const Tensor<1,dim> &p) const +{ double q=0; for (unsigned int i=0; i &p) const { template inline -Tensor<1,dim> Tensor<1,dim>:: -operator + (const Tensor<1,dim> &p) const { +Tensor<1,dim> Tensor<1,dim>::operator + (const Tensor<1,dim> &p) const +{ return (Tensor<1,dim>(*this) += p); }; @@ -406,8 +409,8 @@ operator + (const Tensor<1,dim> &p) const { template inline -Tensor<1,dim> Tensor<1,dim>:: -operator - (const Tensor<1,dim> &p) const { +Tensor<1,dim> Tensor<1,dim>::operator - (const Tensor<1,dim> &p) const +{ return (Tensor<1,dim>(*this) -= p); }; @@ -415,7 +418,8 @@ operator - (const Tensor<1,dim> &p) const { template inline -void Tensor<1,dim>::clear () { +void Tensor<1,dim>::clear () +{ for (unsigned int i=0; i::clear () { template inline -ostream & operator << (ostream &out, const Tensor<1,dim> &p) { +ostream & operator << (ostream &out, const Tensor<1,dim> &p) +{ for (unsigned int i=0; i &p) { template <> inline -ostream & operator << (ostream &out, const Tensor<1,1> &p) { +ostream & operator << (ostream &out, const Tensor<1,1> &p) +{ out << p[0]; return out; diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 2cdfe00c78..253532f02d 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -891,8 +891,7 @@ TriaRawIterator::state () const { template inline bool -TriaRawIterator:: -operator < (const TriaRawIterator &i) const { +TriaRawIterator::operator < (const TriaRawIterator &i) const { Assert (state() != invalid, ExcDereferenceInvalidObject()); Assert (i.state() != invalid, ExcDereferenceInvalidObject()); Assert (&accessor.get_triangulation() == &i.accessor.get_triangulation(), diff --git a/deal.II/deal.II/include/grid/tria_iterator.templates.h b/deal.II/deal.II/include/grid/tria_iterator.templates.h index efd3b5985a..70f2024830 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -119,16 +119,14 @@ TriaIterator::TriaIterator () : template inline -TriaIterator:: -TriaIterator (const TriaIterator &i) : +TriaIterator::TriaIterator (const TriaIterator &i) : TriaRawIterator (static_cast >(i)) {}; template inline -TriaIterator:: -TriaIterator (const TriaRawIterator &i) : +TriaIterator::TriaIterator (const TriaRawIterator &i) : TriaRawIterator (i) { #ifdef DEBUG @@ -258,16 +256,14 @@ TriaActiveIterator::TriaActiveIterator () : template inline -TriaActiveIterator:: -TriaActiveIterator (const TriaActiveIterator &i) : +TriaActiveIterator::TriaActiveIterator (const TriaActiveIterator &i) : TriaIterator (static_cast >(i)) {}; template inline -TriaActiveIterator:: -TriaActiveIterator (const TriaRawIterator &i) : +TriaActiveIterator::TriaActiveIterator (const TriaRawIterator &i) : TriaIterator (i) { #ifdef DEBUG @@ -286,8 +282,7 @@ TriaActiveIterator (const TriaRawIterator &i) : template inline -TriaActiveIterator:: -TriaActiveIterator (const TriaIterator &i) : +TriaActiveIterator::TriaActiveIterator (const TriaIterator &i) : TriaIterator (i) { #ifdef DEBUG diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index 496e9bd76d..ccc5e91787 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -552,8 +552,7 @@ MGLevelObject::get_maxlevel () const template -MGCoarseGridLACIteration:: -MGCoarseGridLACIteration(SOLVER &s, +MGCoarseGridLACIteration::MGCoarseGridLACIteration(SOLVER &s, const MATRIX &m, const PRECOND &p) : @@ -566,8 +565,7 @@ MGCoarseGridLACIteration(SOLVER &s, template void -MGCoarseGridLACIteration:: -operator() (const unsigned int /* level */, +MGCoarseGridLACIteration::operator() (const unsigned int /* level */, Vector &dst, const Vector &src) const { diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h index 4c7637a43a..4854e02f62 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h @@ -3,8 +3,7 @@ template template -MGSmootherRelaxation:: -MGSmootherRelaxation (const MGDoFHandler &mg_dof, +MGSmootherRelaxation::MGSmootherRelaxation (const MGDoFHandler &mg_dof, const MGLevelObject > &matrix, const function_ptr relaxation, const unsigned int steps,