Re-concat lines that ended in ::. They were split in the first since Doc++ had proble...

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 ee191480e55fc2dda77fc87c533f2c6196bd5df5..a50cd00d80916046b0e32ced2af229be17b5a9a9 100644 (file)
--- 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 <class T>
 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 8651b84b76ebdc1e7367f078db18ebb4209dcd19..9528404739584c0f3b1857c0e0275d8baebe3104 100644 (file)
--- a/deal.II/base/include/base/tensor.h
+++ b/deal.II/base/include/base/tensor.h
@@ -191,7 +191,8 @@ class Tensor
 
 template <int rank_, int dim>
 inline
-Tensor<rank_,dim>::Tensor () {
+Tensor<rank_,dim>::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<rank_,dim>::Tensor () {
 
 template <int rank_, int dim>
 inline
-Tensor<rank_,dim>::Tensor (const array_type &initializer) {
+Tensor<rank_,dim>::Tensor (const array_type &initializer)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] =  Tensor<rank_-1,dim>(initializer[i]);
 };
@@ -212,8 +214,8 @@ Tensor<rank_,dim>::Tensor (const array_type &initializer) {
 template <int rank_, int dim>
 inline
 Tensor<rank_-1,dim> &
-Tensor<rank_,dim>::
-operator[] (const unsigned int i) {
+Tensor<rank_,dim>::operator[] (const unsigned int i)
+{
   Assert (i<dim, ExcIndexRange(i, 0, dim));
   
   return subtensor[i];
@@ -224,8 +226,8 @@ operator[] (const unsigned int i) {
 template <int rank_, int dim>
 inline
 const Tensor<rank_-1,dim> &
-Tensor<rank_,dim>::
-operator[] (const unsigned int i) const {
+Tensor<rank_,dim>::operator[] (const unsigned int i) const
+{
   Assert (i<dim, ExcIndexRange(i, 0, dim));
   
   return subtensor[i];
@@ -236,8 +238,8 @@ operator[] (const unsigned int i) const {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim> &
-Tensor<rank_,dim>::
-operator = (const Tensor<rank_,dim> &t) {
+Tensor<rank_,dim>::operator = (const Tensor<rank_,dim> &t)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] = t.subtensor[i];
   return *this;
@@ -248,8 +250,8 @@ operator = (const Tensor<rank_,dim> &t) {
 template <int rank_, int dim>
 inline
 bool
-Tensor<rank_,dim>::
-operator == (const Tensor<rank_,dim> &p) const {
+Tensor<rank_,dim>::operator == (const Tensor<rank_,dim> &p) const
+{
   for (unsigned int i=0; i<dim; ++i)
     if (subtensor[i] != p.subtensor[i]) return false;
   return true;
@@ -260,8 +262,8 @@ operator == (const Tensor<rank_,dim> &p) const {
 template <int rank_, int dim>
 inline
 bool
-Tensor<rank_,dim>::
-operator != (const Tensor<rank_,dim> &p) const {
+Tensor<rank_,dim>::operator != (const Tensor<rank_,dim> &p) const
+{
   return !((*this) == p);
 };
 
@@ -270,8 +272,8 @@ operator != (const Tensor<rank_,dim> &p) const {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim> &
-Tensor<rank_,dim>::
-operator += (const Tensor<rank_,dim> &p) {
+Tensor<rank_,dim>::operator += (const Tensor<rank_,dim> &p)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] += p.subtensor[i];
   return *this;
@@ -282,8 +284,8 @@ operator += (const Tensor<rank_,dim> &p) {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim> &
-Tensor<rank_,dim>::
-operator -= (const Tensor<rank_,dim> &p) {
+Tensor<rank_,dim>::operator -= (const Tensor<rank_,dim> &p)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] -= p.subtensor[i];
   return *this;
@@ -294,8 +296,8 @@ operator -= (const Tensor<rank_,dim> &p) {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim> &
-Tensor<rank_,dim>::
-operator *= (const double &s) {
+Tensor<rank_,dim>::operator *= (const double &s)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] *= s;
   return *this;
@@ -306,8 +308,8 @@ operator *= (const double &s) {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim> &
-Tensor<rank_,dim>::
-operator /= (const double &s) {
+Tensor<rank_,dim>::operator /= (const double &s)
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i] /= s;
   return *this;
@@ -318,8 +320,8 @@ operator /= (const double &s) {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim>
-Tensor<rank_,dim>::
-operator + (const Tensor<rank_,dim> &t) const {
+Tensor<rank_,dim>::operator + (const Tensor<rank_,dim> &t) const
+{
   Tensor<rank_,dim> tmp(*this);
   
   for (unsigned int i=0; i<dim; ++i)
@@ -333,8 +335,8 @@ operator + (const Tensor<rank_,dim> &t) const {
 template <int rank_, int dim>
 inline
 Tensor<rank_,dim>
-Tensor<rank_,dim>::
-operator - (const Tensor<rank_,dim> &t) const {
+Tensor<rank_,dim>::operator - (const Tensor<rank_,dim> &t) const
+{
   Tensor<rank_,dim> tmp(*this);
   
   for (unsigned int i=0; i<dim; ++i)
@@ -347,7 +349,8 @@ operator - (const Tensor<rank_,dim> &t) const {
 
 template <int rank_, int dim>
 inline
-void Tensor<rank_,dim>::clear () {
+void Tensor<rank_,dim>::clear ()
+{
   for (unsigned int i=0; i<dim; ++i)
     subtensor[i].clear();
 };

diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h
index 885df4763205e4c592cd9276fda0f244fc521863..4f6764444a1a2063d22a82a643a7b28c874b430b 100644 (file)
--- a/deal.II/base/include/base/tensor_base.h
+++ b/deal.II/base/include/base/tensor_base.h
@@ -260,7 +260,8 @@ ostream & operator << (ostream &out, const Tensor<1,dim> &p);
 
 template <int dim>
 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 <int dim>
 inline
-Tensor<1,dim>::Tensor (const array_type &initializer) {
+Tensor<1,dim>::Tensor (const array_type &initializer)
+{
   for (unsigned int i=0; i<dim; ++i)
     values[i] = initializer[i];
 };
@@ -281,7 +283,8 @@ Tensor<1,dim>::Tensor (const array_type &initializer) {
 
 template <int dim>
 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<dim; ++i)
     values[i] = p.values[i];
 };
@@ -290,8 +293,8 @@ Tensor<1,dim>::Tensor (const Tensor<1,dim> &p) {
 
 template <int dim>
 inline
-double Tensor<1,dim>::
-operator [] (const unsigned int index) const {
+double Tensor<1,dim>::operator [] (const unsigned int index) const
+{
   Assert (index<dim, ExcIndexRange (index, 0, dim));
   return values[index];
 };
@@ -300,8 +303,8 @@ operator [] (const unsigned int index) const {
 
 template <int dim>
 inline
-double & Tensor<1,dim>::
-operator [] (const unsigned int index) {
+double & Tensor<1,dim>::operator [] (const unsigned int index)
+{
   Assert (index<dim, ExcIndexRange (index, 0, dim));
   return values[index];
 };
@@ -310,8 +313,8 @@ operator [] (const unsigned int index) {
 
 template <int dim>
 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<dim; ++i)
     values[i] = p.values[i];
   return *this;
@@ -321,8 +324,8 @@ operator = (const Tensor<1,dim> &p) {
 
 template <int dim>
 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<dim; ++i)
     if (values[i] != p.values[i]) return false;
   return true;
@@ -332,8 +335,8 @@ operator == (const Tensor<1,dim> &p) const {
 
 template <int dim>
 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 <int dim>
 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<dim; ++i)
     values[i] += p.values[i];
   return *this;
@@ -352,8 +355,8 @@ operator += (const Tensor<1,dim> &p) {
 
 template <int dim>
 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<dim; ++i)
     values[i] -= p.values[i];
   return *this;
@@ -363,8 +366,8 @@ operator -= (const Tensor<1,dim> &p) {
 
 template <int dim>
 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<dim; ++i)
     values[i] *= s;
   return *this;
@@ -374,8 +377,8 @@ operator *= (const double &s) {
 
 template <int dim>
 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<dim; ++i)
     values[i] /= s;
   return *this;
@@ -385,8 +388,8 @@ operator /= (const double &s) {
 
 template <int dim>
 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<dim; ++i)
     q += values[i] * p.values[i];
@@ -397,8 +400,8 @@ operator * (const Tensor<1,dim> &p) const {
 
 template <int dim>
 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 <int dim>
 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 <int dim>
 inline
-void Tensor<1,dim>::clear () {
+void Tensor<1,dim>::clear ()
+{
   for (unsigned int i=0; i<dim; ++i)
     values[i] = 0;
 };
@@ -427,7 +431,8 @@ void Tensor<1,dim>::clear () {
 
 template <int dim>
 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<dim-1; ++i)
     out << p[i] << ' ';
   out << p[dim-1];
@@ -438,7 +443,8 @@ ostream & operator << (ostream &out, const Tensor<1,dim> &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 2cdfe00c78a9abac98f14182dff68dd8f5288820..253532f02dbfd616e0f553c949d4376976ff78d4 100644 (file)
--- 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<dim,Accessor>::state () const {
 template <int dim, typename Accessor>
 inline
 bool
-TriaRawIterator<dim,Accessor>::
-operator < (const TriaRawIterator &i) const {
+TriaRawIterator<dim,Accessor>::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 efd3b5985a6c17d57f4864f97f5e62cceca2119f..70f2024830643127885a8a4644886223059973dc 100644 (file)
--- 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<dim,Accessor>::TriaIterator () :
 
 template <int dim, typename Accessor>
 inline
-TriaIterator<dim,Accessor>::
-TriaIterator (const TriaIterator<dim,Accessor> &i) :
+TriaIterator<dim,Accessor>::TriaIterator (const TriaIterator<dim,Accessor> &i) :
                TriaRawIterator<dim,Accessor> (static_cast<TriaRawIterator<dim,Accessor> >(i)) {};
 
 
 
 template <int dim, typename Accessor>
 inline
-TriaIterator<dim,Accessor>::
-TriaIterator (const TriaRawIterator<dim,Accessor> &i) :
+TriaIterator<dim,Accessor>::TriaIterator (const TriaRawIterator<dim,Accessor> &i) :
                TriaRawIterator<dim,Accessor> (i)
 {
 #ifdef DEBUG
@@ -258,16 +256,14 @@ TriaActiveIterator<dim,Accessor>::TriaActiveIterator () :
 
 template <int dim, typename Accessor>
 inline
-TriaActiveIterator<dim,Accessor>::
-TriaActiveIterator (const TriaActiveIterator<dim,Accessor> &i) :
+TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaActiveIterator<dim,Accessor> &i) :
                TriaIterator<dim,Accessor> (static_cast<TriaIterator<dim,Accessor> >(i)) {};
 
 
 
 template <int dim, typename Accessor>
 inline
-TriaActiveIterator<dim,Accessor>::
-TriaActiveIterator (const TriaRawIterator<dim,Accessor> &i) :
+TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaRawIterator<dim,Accessor> &i) :
                TriaIterator<dim,Accessor> (i)
 {
 #ifdef DEBUG
@@ -286,8 +282,7 @@ TriaActiveIterator (const TriaRawIterator<dim,Accessor> &i) :
 
 template <int dim, typename Accessor>
 inline
-TriaActiveIterator<dim,Accessor>::
-TriaActiveIterator (const TriaIterator<dim,Accessor> &i) :
+TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaIterator<dim,Accessor> &i) :
                TriaIterator<dim,Accessor> (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 496e9bd76d9074e70933886e3bfb17166152cc27..ccc5e91787a1df6268d1c40ee29b07be8872d465 100644 (file)
--- 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<Object>::get_maxlevel () const
 
 
 template<class SOLVER, class MATRIX, class PRECOND>
-MGCoarseGridLACIteration<SOLVER,MATRIX,PRECOND>::
-MGCoarseGridLACIteration(SOLVER        &s,
+MGCoarseGridLACIteration<SOLVER,MATRIX,PRECOND>::MGCoarseGridLACIteration(SOLVER        &s,
                         const MATRIX  &m,
                         const PRECOND &p)
                :
@@ -566,8 +565,7 @@ MGCoarseGridLACIteration(SOLVER        &s,
 
 template<class SOLVER, class MATRIX, class PRECOND>
 void
-MGCoarseGridLACIteration<SOLVER,MATRIX,PRECOND>::
-operator() (const unsigned int    /* level */,
+MGCoarseGridLACIteration<SOLVER,MATRIX,PRECOND>::operator() (const unsigned int    /* level */,
            Vector<double>       &dst,
            const Vector<double> &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 4c7637a43a135c65516a3b250910d7716171fe25..4854e02f622f8f4db0dbdfaf6799af6662b2f87c 100644 (file)
--- 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<typename number>
 template<int dim>
-MGSmootherRelaxation<number>::
-MGSmootherRelaxation (const MGDoFHandler<dim>                       &mg_dof,
+MGSmootherRelaxation<number>::MGSmootherRelaxation (const MGDoFHandler<dim>                       &mg_dof,
                      const MGLevelObject<SparseMatrix<number> > &matrix,
                      const function_ptr                             relaxation,
                      const unsigned int                             steps,