From: wolf Date: Tue, 1 Jun 1999 13:04:58 +0000 (+0000) Subject: Doc updates to make doc++ happy with operator definitions. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2fa01eb0dd9359dd55ba02db7df48f837c94711;p=dealii-svn.git Doc updates to make doc++ happy with operator definitions. git-svn-id: https://svn.dealii.org/trunk@1360 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 90e94dd4cd..3eeb490e18 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -211,9 +211,14 @@ LogStream::push (const string& text) +// sorry for the weird following declaration spanning 5 lines, but +// doc++ gets confused if we be more compact :-( + template -inline LogStream& -LogStream::operator << (const T& t) +inline +LogStream & +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 ba62696522..04e12a164d 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -134,7 +134,7 @@ class Tensor // /** * Fill a vector with all tensor elements. * - * Thsi function unrolls all + * This function unrolls all * tensor entries into a single, * linearly numbered vector. As * usual in C++, the rightmost @@ -180,6 +180,9 @@ class Tensor // /*--------------------------- Inline functions -----------------------------*/ +// in the following, declarations of operators look rather weird because they are +// split over several lines. this is necessary, however, because otherwise doc++ +// gets really confused about this all... :-( template @@ -205,7 +208,8 @@ Tensor::Tensor (const array_type &initializer) { template inline Tensor & -Tensor::operator[] (const unsigned int i) { +Tensor:: +operator[] (const unsigned int i) { Assert (i::operator[] (const unsigned int i) { template inline const Tensor & -Tensor::operator[] (const unsigned int i) const { +Tensor:: +operator[] (const unsigned int i) const { Assert (i::operator[] (const unsigned int i) const { template inline -Tensor & Tensor::operator = (const Tensor &t) { +Tensor & +Tensor:: +operator = (const Tensor &t) { for (unsigned int i=0; i & Tensor::operator = (const Tensor &t) { template inline -bool Tensor::operator == (const Tensor &p) const { +bool +Tensor:: +operator == (const Tensor &p) const { for (unsigned int i=0; i::operator == (const Tensor &p) const { template inline -bool Tensor::operator != (const Tensor &p) const { +bool +Tensor:: +operator != (const Tensor &p) const { return !((*this) == p); }; @@ -254,7 +265,9 @@ bool Tensor::operator != (const Tensor &p) const { template inline -Tensor & Tensor::operator += (const Tensor &p) { +Tensor & +Tensor:: +operator += (const Tensor &p) { for (unsigned int i=0; i & Tensor::operator += (const Tensor &p) template inline -Tensor & Tensor::operator -= (const Tensor &p) { +Tensor & +Tensor:: +operator -= (const Tensor &p) { for (unsigned int i=0; i & Tensor::operator -= (const Tensor &p) template inline -Tensor & Tensor::operator *= (const double &s) { +Tensor & +Tensor:: +operator *= (const double &s) { for (unsigned int i=0; i & Tensor::operator *= (const double &s) { template inline -Tensor & Tensor::operator /= (const double &s) { +Tensor & +Tensor:: +operator /= (const double &s) { for (unsigned int i=0; i & Tensor::operator /= (const double &s) { template inline Tensor -Tensor::operator + (const Tensor &t) const { +Tensor:: +operator + (const Tensor &t) const { Tensor tmp(*this); for (unsigned int i=0; i::operator + (const Tensor &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 &p); /*------------------------------- Inline functions: Tensor ---------------------------*/ +// in the following, declarations of operators look rather weird because they are +// split over several lines. this is necessary, however, because otherwise doc++ +// gets really confused about this all... :-( + template @@ -253,7 +257,8 @@ Tensor<1,dim>::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::operator [] (const unsigned int index) const { template inline -double & Tensor<1,dim>::operator [] (const unsigned int index) { +double & Tensor<1,dim>:: +operator [] (const unsigned int index) { Assert (index::operator [] (const unsigned int index) { 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 & Tensor<1,dim>::operator = (const Tensor<1,dim> &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::operator == (const Tensor<1,dim> &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); }; @@ -299,7 +308,8 @@ bool Tensor<1,dim>::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 & Tensor<1,dim>::operator += (const Tensor<1,dim> &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 & Tensor<1,dim>::operator -= (const Tensor<1,dim> &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 & Tensor<1,dim>::operator *= (const double &s) { 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 & Tensor<1,dim>::operator /= (const double &s) { template 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::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); }; @@ -358,7 +373,8 @@ Tensor<1,dim> Tensor<1,dim>::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); };