From: deal Date: Fri, 3 Jan 2003 22:21:47 +0000 (+0000) Subject: The new parser in gcc CVS has a lot to say, so fix the respective places. They belong... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c064b6737cc892e29a73cf9fdb49298c22d398;p=dealii-svn.git The new parser in gcc CVS has a lot to say, so fix the respective places. They belong to two categories: 1. more typenames necessary. 2. semicolons at the end of member functions or namespces are not necessary, and the compiler now warns about this. git-svn-id: https://svn.dealii.org/trunk@6862 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 42bdc72147..e9bf8556f5 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -5,7 +5,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002 by the deal.II authors +// Copyright (C) 2001, 2002, 2003 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -268,6 +268,6 @@ namespace deal_II_numbers { * 1/sqrt(2) */ static const double SQRT1_2 = 0.70710678118654752440; -}; +} #endif diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index aab724c0ec..9c03f445e5 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -2062,7 +2062,7 @@ bool DataOutBase::EpsFlags::RgbValues::is_grey () const { return (red == green) && (red == blue); -}; +} diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index 34924656e6..7ad7fd9ba6 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -531,7 +531,7 @@ namespace deal_II_exceptions } -}; +} @@ -934,7 +934,7 @@ namespace StandardExceptions << arg1 << " switch. You should either use an\n" << "alternative function, or configure again without\n" << "this switch and recompile the library."); -}; +} using namespace StandardExceptions; diff --git a/deal.II/base/include/base/function_time.h b/deal.II/base/include/base/function_time.h index f90894386c..a747284bb9 100644 --- a/deal.II/base/include/base/function_time.h +++ b/deal.II/base/include/base/function_time.h @@ -105,7 +105,7 @@ inline double FunctionTime::get_time () const { return time; -}; +} #endif diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index ee1b9c7c14..a392404c82 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -306,7 +306,7 @@ LogStream::operator<< (const T& t) // the two operator<< functions print (t); return *this; -}; +} @@ -326,7 +326,7 @@ LogStream::operator<< (std::ostream& (*p) (std::ostream&)) was_endl = true; return *this; -}; +} diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index aae8b8a1d1..017f5c583f 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -393,7 +393,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const bool) { return sizeof(bool); - }; + } @@ -401,7 +401,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const char) { return sizeof(char); - }; + } @@ -409,7 +409,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const short int) { return sizeof(short int); - }; + } @@ -417,7 +417,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const short unsigned int) { return sizeof(short unsigned int); - }; + } @@ -425,7 +425,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const int) { return sizeof(int); - }; + } @@ -433,7 +433,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const unsigned int) { return sizeof(unsigned int); - }; + } @@ -441,7 +441,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const float) { return sizeof(float); - }; + } @@ -449,7 +449,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const double) { return sizeof(double); - }; + } @@ -457,7 +457,7 @@ namespace MemoryConsumption unsigned int memory_consumption (const std::string &s) { return sizeof(s) + s.length(); - }; + } // if necessary try to work around a bug in the IBM xlC compiler diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index 5a25b13ae8..a9798122fd 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -738,7 +738,7 @@ namespace Patterns */ virtual PatternBase * clone () const; }; -}; +} /** diff --git a/deal.II/base/include/base/point.h b/deal.II/base/include/base/point.h index 71e53792ed..4c224d9983 100644 --- a/deal.II/base/include/base/point.h +++ b/deal.II/base/include/base/point.h @@ -176,7 +176,7 @@ class Point : public Tensor<1,dim> template inline Point::Point () -{}; +{} @@ -184,7 +184,7 @@ template inline Point::Point (const bool initialize) : Tensor<1,dim>(initialize) -{}; +{} @@ -192,7 +192,7 @@ template inline Point::Point (const Tensor<1,dim> &t) : Tensor<1,dim>(t) -{}; +{} @@ -202,7 +202,7 @@ Point::Point (const double x) { Assert (dim==1, ExcInvalidConstructorCalled()); this->values[0] = x; -}; +} @@ -213,7 +213,7 @@ Point::Point (const double x, const double y) Assert (dim==2, ExcInvalidConstructorCalled()); this->values[0] = x; this->values[1] = y; -}; +} @@ -225,7 +225,7 @@ Point::Point (const double x, const double y, const double z) this->values[0] = x; this->values[1] = y; this->values[2] = z; -}; +} @@ -235,7 +235,7 @@ double Point::operator () (const unsigned int index) const { Assert (indexvalues[index]; -}; +} @@ -245,7 +245,7 @@ double & Point::operator () (const unsigned int index) { Assert (indexvalues[index]; -}; +} @@ -254,7 +254,7 @@ inline Point Point::operator + (const Tensor<1,dim> &p) const { return (Point(*this) += p); -}; +} @@ -263,7 +263,7 @@ inline Point Point::operator - (const Tensor<1,dim> &p) const { return (Point(*this) -= p); -}; +} @@ -275,7 +275,7 @@ Point Point::operator - () const for (unsigned int i=0; ivalues[i]; return result; -}; +} @@ -284,7 +284,7 @@ inline Point Point::operator * (const double factor) const { return (Point(*this) *= factor); -}; +} @@ -294,7 +294,7 @@ double Point::operator * (const Tensor<1,dim> &p) const { // simply pass down return Tensor<1,dim>::operator * (p); -}; +} template @@ -305,7 +305,7 @@ double Point::square () const for (unsigned int i=0; ivalues[i] * this->values[i]; return q; -}; +} template @@ -328,7 +328,7 @@ inline Point Point::operator / (const double factor) const { return (Point(*this) /= factor); -}; +} @@ -343,7 +343,7 @@ inline Point operator * (const double factor, const Point &p) { return p*factor; -}; +} /** @@ -359,7 +359,7 @@ std::ostream & operator << (std::ostream &out, const Point &p) out << p[dim-1]; return out; -}; +} @@ -374,6 +374,6 @@ std::ostream & operator << (std::ostream &out, const Point<1> &p) out << p[0]; return out; -}; +} #endif diff --git a/deal.II/base/include/base/smartpointer.h b/deal.II/base/include/base/smartpointer.h index 8d2a5d6d83..ef32d229f3 100644 --- a/deal.II/base/include/base/smartpointer.h +++ b/deal.II/base/include/base/smartpointer.h @@ -185,7 +185,7 @@ class SmartPointer template SmartPointer::SmartPointer () : t (0) -{}; +{} @@ -195,7 +195,7 @@ SmartPointer::SmartPointer (T *t) : { if (t != 0) t->subscribe(); -}; +} @@ -205,7 +205,7 @@ SmartPointer::SmartPointer (const SmartPointer &tt) : { if (t != 0) t->subscribe(); -}; +} @@ -214,7 +214,7 @@ SmartPointer::~SmartPointer () { if (t != 0) t->unsubscribe(); -}; +} @@ -232,7 +232,7 @@ SmartPointer & SmartPointer::operator = (T *tt) if (tt != 0) tt->subscribe(); return *this; -}; +} @@ -251,7 +251,7 @@ SmartPointer & SmartPointer::operator = (const SmartPointer& tt) if (tt != 0) tt->subscribe(); return *this; -}; +} @@ -260,7 +260,7 @@ inline SmartPointer::operator T* () const { return t; -}; +} @@ -269,7 +269,7 @@ inline T & SmartPointer::operator * () const { return *t; -}; +} @@ -278,7 +278,7 @@ inline T * SmartPointer::operator -> () const { return t; -}; +} @@ -287,7 +287,7 @@ inline void SmartPointer::swap (SmartPointer &tt) { swap (t, tt.t); -}; +} @@ -302,7 +302,7 @@ void SmartPointer::swap (T *&tt) if (t != 0) t->subscribe (); -}; +} @@ -311,7 +311,7 @@ inline unsigned int SmartPointer::memory_consumption () const { return sizeof(SmartPointer); -}; +} @@ -326,7 +326,7 @@ inline void swap (SmartPointer &t1, SmartPointer &t2) { t1.swap (t2); -}; +} @@ -342,7 +342,7 @@ inline void swap (SmartPointer &t1, T *&t2) { t1.swap (t2); -}; +} @@ -358,7 +358,7 @@ inline void swap (T *&t1, SmartPointer &t2) { t2.swap (t1); -}; +} #endif diff --git a/deal.II/base/include/base/table.h b/deal.II/base/include/base/table.h index 5de5813aa9..098f69999f 100644 --- a/deal.II/base/include/base/table.h +++ b/deal.II/base/include/base/table.h @@ -615,7 +615,7 @@ namespace TableBaseAccessors friend class Accessor; #endif }; -}; +} @@ -1552,7 +1552,7 @@ TableIndicesBase::operator [] (const unsigned int i) const { Assert (i < N, ExcIndexRange (i, 0, N)); return indices[i]; -}; +} @@ -1560,7 +1560,7 @@ inline TableIndices<1>::TableIndices () { this->indices[0] = 0; -}; +} @@ -1568,7 +1568,7 @@ inline TableIndices<1>::TableIndices (const unsigned int index1) { this->indices[0] = index1; -}; +} @@ -1576,7 +1576,7 @@ inline TableIndices<2>::TableIndices () { this->indices[0] = this->indices[1] = 0; -}; +} @@ -1586,7 +1586,7 @@ TableIndices<2>::TableIndices (const unsigned int index1, { this->indices[0] = index1; this->indices[1] = index2; -}; +} @@ -1594,7 +1594,7 @@ inline TableIndices<3>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = 0; -}; +} @@ -1606,14 +1606,14 @@ TableIndices<3>::TableIndices (const unsigned int index1, this->indices[0] = index1; this->indices[1] = index2; this->indices[2] = index3; -}; +} inline TableIndices<4>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = 0; -}; +} @@ -1627,7 +1627,7 @@ TableIndices<4>::TableIndices (const unsigned int index1, this->indices[1] = index2; this->indices[2] = index3; this->indices[3] = index4; -}; +} @@ -1635,7 +1635,7 @@ inline TableIndices<5>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = this->indices[4] = 0; -}; +} @@ -1651,7 +1651,7 @@ TableIndices<5>::TableIndices (const unsigned int index1, this->indices[2] = index3; this->indices[3] = index4; this->indices[4] = index5; -}; +} @@ -1660,7 +1660,7 @@ TableIndices<6>::TableIndices () { this->indices[0] = this->indices[1] = this->indices[2] = this->indices[3] = this->indices[4] = 0; -}; +} @@ -1678,7 +1678,7 @@ TableIndices<6>::TableIndices (const unsigned int index1, this->indices[3] = index4; this->indices[4] = index5; this->indices[5] = index6; -}; +} @@ -1687,7 +1687,7 @@ TableBase::TableBase () : val (0), val_size (0) -{}; +{} @@ -1698,7 +1698,7 @@ TableBase::TableBase (const TableIndices &sizes) val_size (0) { reinit (sizes); -}; +} @@ -1712,7 +1712,7 @@ TableBase::TableBase (const TableBase &src) reinit (src.table_size); if (src.n_elements() != 0) fill (src.data()); -}; +} @@ -1726,7 +1726,7 @@ TableBase::TableBase (const TableBase &src) reinit (src.table_size); if (src.n_elements() != 0) fill (src.data()); -}; +} @@ -1739,7 +1739,7 @@ namespace TableBaseAccessors : table (table), data (data) - {}; + {} @@ -1754,7 +1754,7 @@ namespace TableBaseAccessors // temporary objects, so should // not need to be copied around Assert (false, ExcInternalError()); - }; + } @@ -1769,7 +1769,7 @@ namespace TableBaseAccessors // temporary objects, so should // not need to be copied around Assert (false, ExcInternalError()); - }; + } @@ -1797,7 +1797,7 @@ namespace TableBaseAccessors const pointer new_data = data + i*subobject_size; return Accessor (table, new_data); }; - }; + } @@ -1808,7 +1808,7 @@ namespace TableBaseAccessors : table (table), data (data) - {}; + {} @@ -1823,7 +1823,7 @@ namespace TableBaseAccessors // temporary objects, so should // not need to be copied around Assert (false, ExcInternalError()); - }; + } @@ -1838,7 +1838,7 @@ namespace TableBaseAccessors // temporary objects, so should // not need to be copied around Assert (false, ExcInternalError()); - }; + } @@ -1850,7 +1850,7 @@ namespace TableBaseAccessors Assert (i < table.size()[N-1], ExcIndexRange (i, 0, table.size()[N-1])); return data[i]; - }; + } @@ -1860,7 +1860,7 @@ namespace TableBaseAccessors Accessor::size () const { return table.size()[N-1]; - }; + } @@ -1870,7 +1870,7 @@ namespace TableBaseAccessors Accessor::begin () const { return data; - }; + } @@ -1880,8 +1880,8 @@ namespace TableBaseAccessors Accessor::end () const { return data+table.size()[N-1]; - }; -}; + } +} @@ -1891,7 +1891,7 @@ TableBase::~TableBase () { if (val != 0) delete[] val; -}; +} @@ -1929,7 +1929,7 @@ TableBase::clear () { if (n_elements() != 0) std::fill_n (val, n_elements(), T()); -}; +} @@ -1975,7 +1975,7 @@ TableBase::reinit (const TableIndices &new_sizes) // reinitialize contents of old or // new memory. clear (); -}; +} @@ -1984,7 +1984,7 @@ const TableIndices & TableBase::size () const { return table_size; -}; +} @@ -1996,7 +1996,7 @@ TableBase::n_elements () const for (unsigned int n=0; n::empty () const { return (n_elements() == 0); -}; +} @@ -2058,7 +2058,7 @@ TableBase::position (const TableIndices &indices) const return s; }; }; -}; +} @@ -2071,7 +2071,7 @@ TableBase::operator() (const TableIndices &indices) const Assert (indices[n] < table_size[n], ExcIndexRange (indices[n], 0, table_size[n])); return el(indices); -}; +} @@ -2083,7 +2083,7 @@ TableBase::operator() (const TableIndices &indices) Assert (indices[n] < table_size[n], ExcIndexRange (indices[n], 0, table_size[n])); return el(indices); -}; +} @@ -2092,7 +2092,7 @@ inline const T & TableBase::el (const TableIndices &indices) const { return val[position(indices)]; -}; +} @@ -2101,7 +2101,7 @@ inline T & TableBase::el (const TableIndices &indices) { return val[position(indices)]; -}; +} @@ -2118,7 +2118,7 @@ TableBase::data () const template Table<1,T>::Table () -{}; +{} @@ -2126,7 +2126,7 @@ template Table<1,T>::Table (const unsigned int size) : TableBase<1,T> (TableIndices<1> (size)) -{}; +{} @@ -2137,7 +2137,7 @@ Table<1,T>::operator [] (const unsigned int i) const Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); return this->val[i]; -}; +} @@ -2148,7 +2148,7 @@ Table<1,T>::operator [] (const unsigned int i) Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); return this->val[i]; -}; +} @@ -2160,7 +2160,7 @@ Table<1,T>::operator () (const unsigned int i) const Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); return this->val[i]; -}; +} @@ -2172,14 +2172,14 @@ Table<1,T>::operator () (const unsigned int i) Assert (i < this->table_size[0], ExcIndexRange (i, 0, this->table_size[0])); return this->val[i]; -}; +} template Table<2,T>::Table () -{}; +{} @@ -2188,7 +2188,7 @@ Table<2,T>::Table (const unsigned int size1, const unsigned int size2) : TableBase<2,T> (TableIndices<2> (size1, size2)) -{}; +{} @@ -2198,7 +2198,7 @@ Table<2,T>::reinit (const unsigned int size1, const unsigned int size2) { this->TableBase<2,T>::reinit (TableIndices<2> (size1, size2)); -}; +} @@ -2211,7 +2211,7 @@ Table<2,T>::operator [] (const unsigned int i) const ExcIndexRange (i, 0, this->table_size[0])); return TableBaseAccessors::Accessor<2,T,true,1>(*this, this->val+i*n_cols()); -}; +} @@ -2224,7 +2224,7 @@ Table<2,T>::operator [] (const unsigned int i) ExcIndexRange (i, 0, this->table_size[0])); return TableBaseAccessors::Accessor<2,T,false,1>(*this, this->val+i*n_cols()); -}; +} @@ -2239,7 +2239,7 @@ Table<2,T>::operator () (const unsigned int i, Assert (j < this->table_size[1], ExcIndexRange (j, 0, this->table_size[1])); return this->val[i*this->table_size[1]+j]; -}; +} @@ -2254,7 +2254,7 @@ Table<2,T>::operator () (const unsigned int i, Assert (j < this->table_size[1], ExcIndexRange (j, 0, this->table_size[1])); return this->val[i*this->table_size[1]+j]; -}; +} @@ -2265,7 +2265,7 @@ Table<2,T>::el (const unsigned int i, const unsigned int j) const { return this->val[i*this->table_size[1]+j]; -}; +} @@ -2276,7 +2276,7 @@ Table<2,T>::el (const unsigned int i, const unsigned int j) { return this->val[i*this->table_size[1]+j]; -}; +} @@ -2286,7 +2286,7 @@ unsigned int Table<2,T>::n_rows () const { return this->table_size[0]; -}; +} @@ -2296,7 +2296,7 @@ unsigned int Table<2,T>::n_cols () const { return this->table_size[1]; -}; +} @@ -2304,7 +2304,7 @@ Table<2,T>::n_cols () const template Table<3,T>::Table () -{}; +{} @@ -2314,7 +2314,7 @@ Table<3,T>::Table (const unsigned int size1, const unsigned int size3) : TableBase<3,T> (TableIndices<3> (size1, size2, size3)) -{}; +{} @@ -2330,7 +2330,7 @@ Table<3,T>::operator [] (const unsigned int i) const return (TableBaseAccessors::Accessor<3,T,true,2> (*this, this->val+i*subobject_size)); -}; +} @@ -2346,7 +2346,7 @@ Table<3,T>::operator [] (const unsigned int i) return (TableBaseAccessors::Accessor<3,T,false,2> (*this, this->val+i*subobject_size)); -}; +} @@ -2365,7 +2365,7 @@ Table<3,T>::operator () (const unsigned int i, ExcIndexRange (k, 0, this->table_size[2])); return this->val[(i*this->table_size[1]+j) *this->table_size[2] + k]; -}; +} @@ -2384,13 +2384,13 @@ Table<3,T>::operator () (const unsigned int i, ExcIndexRange (k, 0, this->table_size[2])); return this->val[(i*this->table_size[1]+j) *this->table_size[2] + k]; -}; +} template Table<4,T>::Table () -{}; +{} @@ -2401,7 +2401,7 @@ Table<4,T>::Table (const unsigned int size1, const unsigned int size4) : TableBase<4,T> (TableIndices<4> (size1, size2, size3, size4)) -{}; +{} @@ -2418,7 +2418,7 @@ Table<4,T>::operator [] (const unsigned int i) const return (TableBaseAccessors::Accessor<4,T,true,3> (*this, this->val+i*subobject_size)); -}; +} @@ -2435,7 +2435,7 @@ Table<4,T>::operator [] (const unsigned int i) return (TableBaseAccessors::Accessor<4,T,false,3> (*this, this->val+i*subobject_size)); -}; +} @@ -2458,7 +2458,7 @@ Table<4,T>::operator () (const unsigned int i, return this->val[((i*this->table_size[1]+j) *this->table_size[2] + k) *this->table_size[3] + l]; -}; +} @@ -2481,14 +2481,14 @@ Table<4,T>::operator () (const unsigned int i, return this->val[((i*this->table_size[1]+j) *this->table_size[2] + k) *this->table_size[3] + l]; -}; +} template Table<5,T>::Table () -{}; +{} @@ -2500,7 +2500,7 @@ Table<5,T>::Table (const unsigned int size1, const unsigned int size5) : TableBase<5,T> (TableIndices<5> (size1, size2, size3, size4, size5)) -{}; +{} @@ -2518,7 +2518,7 @@ Table<5,T>::operator [] (const unsigned int i) const return (TableBaseAccessors::Accessor<5,T,true,4> (*this, this->val+i*subobject_size)); -}; +} @@ -2536,7 +2536,7 @@ Table<5,T>::operator [] (const unsigned int i) return (TableBaseAccessors::Accessor<5,T,false,4> (*this, this->val+i*subobject_size)); -}; +} @@ -2563,7 +2563,7 @@ Table<5,T>::operator () (const unsigned int i, *this->table_size[2] + k) *this->table_size[3] + l) *this->table_size[4] + m]; -}; +} @@ -2590,13 +2590,13 @@ Table<5,T>::operator () (const unsigned int i, *this->table_size[2] + k) *this->table_size[3] + l) *this->table_size[4] + m]; -}; +} template Table<6,T>::Table () -{}; +{} @@ -2609,7 +2609,7 @@ Table<6,T>::Table (const unsigned int size1, const unsigned int size6) : TableBase<6,T> (TableIndices<6> (size1, size2, size3, size4, size5, size6)) -{}; +{} @@ -2628,7 +2628,7 @@ Table<6,T>::operator [] (const unsigned int i) const return (TableBaseAccessors::Accessor<6,T,true,5> (*this, this->val+i*subobject_size)); -}; +} @@ -2647,7 +2647,7 @@ Table<6,T>::operator [] (const unsigned int i) return (TableBaseAccessors::Accessor<6,T,false,5> (*this, this->val+i*subobject_size)); -}; +} @@ -2678,7 +2678,7 @@ Table<6,T>::operator () (const unsigned int i, *this->table_size[3] + l) *this->table_size[4] + m) *this->table_size[5] + n]; -}; +} @@ -2709,7 +2709,7 @@ Table<6,T>::operator () (const unsigned int i, *this->table_size[3] + l) *this->table_size[4] + m) *this->table_size[5] + n]; -}; +} diff --git a/deal.II/base/include/base/tensor.h b/deal.II/base/include/base/tensor.h index 2cd00e9ec3..8bafe9c136 100644 --- a/deal.II/base/include/base/tensor.h +++ b/deal.II/base/include/base/tensor.h @@ -224,7 +224,7 @@ 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 -}; +} template @@ -233,7 +233,7 @@ Tensor::Tensor (const array_type &initializer) { for (unsigned int i=0; i(initializer[i]); -}; +} template @@ -244,7 +244,7 @@ Tensor::operator[] (const unsigned int i) Assert (i @@ -255,7 +255,7 @@ Tensor::operator[] (const unsigned int i) const Assert (i @@ -266,7 +266,7 @@ Tensor::operator = (const Tensor &t) for (unsigned int i=0; i @@ -277,7 +277,7 @@ Tensor::operator == (const Tensor &p) const for (unsigned int i=0; i @@ -286,7 +286,7 @@ bool Tensor::operator != (const Tensor &p) const { return !((*this) == p); -}; +} template @@ -297,7 +297,7 @@ Tensor::operator += (const Tensor &p) for (unsigned int i=0; i @@ -308,7 +308,7 @@ Tensor::operator -= (const Tensor &p) for (unsigned int i=0; i @@ -319,7 +319,7 @@ Tensor::operator *= (const double &s) for (unsigned int i=0; i @@ -330,7 +330,7 @@ Tensor::operator /= (const double &s) for (unsigned int i=0; i @@ -344,7 +344,7 @@ Tensor::operator + (const Tensor &t) const tmp.subtensor[i] += t.subtensor[i]; return tmp; -}; +} template @@ -358,7 +358,7 @@ Tensor::operator - (const Tensor &t) const tmp.subtensor[i] -= t.subtensor[i]; return tmp; -}; +} template @@ -372,7 +372,7 @@ Tensor::operator - () const tmp.subtensor[i] = -subtensor[i]; return tmp; -}; +} template @@ -381,7 +381,7 @@ void Tensor::clear () { for (unsigned int i=0; i::memory_consumption () { return sizeof(Tensor); -}; +} /* ----------------- Non-member functions operating on tensors. ------------ */ @@ -412,7 +412,7 @@ std::ostream & operator << (std::ostream &out, const Tensor &p) out << p[dim-1]; return out; -}; +} /** @@ -425,7 +425,7 @@ std::ostream & operator << (std::ostream &out, const Tensor &p) out << p[0]; return out; -}; +} @@ -464,7 +464,7 @@ void contract (Tensor<1,dim> &dest, for (unsigned int i=0; i &dest, for (unsigned int i=0; i &dest, for (unsigned int j=0; j &dest, default: Assert (false, (typename Tensor<2,dim>::ExcInvalidTensorIndex (index1))); }; -}; +} @@ -627,7 +627,7 @@ void contract (Tensor<2,dim> &dest, Assert (false, (typename Tensor<2,dim>::ExcInvalidTensorIndex (index1))); }; -}; +} @@ -649,7 +649,7 @@ void contract (Tensor<3,dim> &dest, for (unsigned int k=0; k &dest, for (unsigned int k=0; k &dest, for (unsigned int l=0; l &dst, for (unsigned int i=0; i &dst, for (unsigned int j=0; j &dst, for (unsigned int j=0; j &dst, { for (unsigned int i=0; i &dst, { for (unsigned int i=0; i &t) // computable in the general // template return determinant(t[0]); -}; +} @@ -881,7 +881,7 @@ inline double determinant (const Tensor<1,1> &t) { return t[0]; -}; +} @@ -895,7 +895,7 @@ double determinant (const Tensor<2,2> &t) { return ((t[0][0] * t[1][1]) - (t[1][0] * t[0][1])); -}; +} @@ -920,7 +920,7 @@ double determinant (const Tensor<2,3> &t) +t[1][0]*t[0][2]*t[2][1] +t[2][0]*t[0][1]*t[1][2] -t[2][0]*t[0][2]*t[1][1] ); -}; +} @@ -937,7 +937,7 @@ double trace (const Tensor<2,dim> &d) for (unsigned int i=0; i &t) AssertThrow (false, ExcNotImplemented()); }; return return_tensor; -}; +} @@ -1029,7 +1029,7 @@ transpose (const Tensor<2,dim> &t) tt[j][i] = x; }; return tt; -}; +} @@ -1044,7 +1044,7 @@ Tensor<2,1> transpose (const Tensor<2,1> &t) { return t; -}; +} @@ -1061,7 +1061,7 @@ transpose (const Tensor<2,2> &t) { const double x[2][2] = {{t[0][0], t[1][0]}, {t[0][1], t[1][1]}}; return Tensor<2,2>(x); -}; +} @@ -1080,7 +1080,7 @@ transpose (const Tensor<2,3> &t) {t[0][1], t[1][1], t[2][1]}, {t[0][2], t[1][2], t[2][2]}}; return Tensor<2,3>(x); -}; +} @@ -1098,7 +1098,7 @@ operator * (const Tensor &t, Tensor tt = t; tt *= factor; return tt; -}; +} @@ -1115,7 +1115,7 @@ operator * (const double factor, Tensor tt = t; tt *= factor; return tt; -}; +} @@ -1131,7 +1131,7 @@ operator / (const Tensor &t, Tensor tt = t; tt /= factor; return tt; -}; +} #endif diff --git a/deal.II/base/include/base/tensor_base.h b/deal.II/base/include/base/tensor_base.h index af2f6b0ca7..7030178acc 100644 --- a/deal.II/base/include/base/tensor_base.h +++ b/deal.II/base/include/base/tensor_base.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -312,7 +312,7 @@ Tensor<1,dim>::Tensor (const bool initialize) if (initialize) for (unsigned int i=0; i!=dim; ++i) values[i] = 0; -}; +} @@ -322,7 +322,7 @@ Tensor<1,dim>::Tensor (const array_type &initializer) { for (unsigned int i=0; i::Tensor (const Tensor<1,dim> &p) { for (unsigned int i=0; i::Tensor (const Tensor<1,0> &) // function that the loop end check // always fails, we implement this // function here -}; +} @@ -360,7 +360,7 @@ double Tensor<1,dim>::operator [] (const unsigned int index) const { Assert (index::operator [] (const unsigned int index) { Assert (index & Tensor<1,dim>::operator = (const Tensor<1,dim> &p) for (unsigned int i=0; i & Tensor<1,0>::operator = (const Tensor<1,0> &) // always fails, we implement this // function here return *this; -}; +} @@ -411,7 +411,7 @@ bool Tensor<1,dim>::operator == (const Tensor<1,dim> &p) const for (unsigned int i=0; i::operator != (const Tensor<1,dim> &p) const { return !((*this) == p); -}; +} @@ -431,7 +431,7 @@ 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) for (unsigned int i=0; i & Tensor<1,dim>::operator *= (const double &s) for (unsigned int i=0; i & Tensor<1,dim>::operator /= (const double &s) for (unsigned int i=0; i::operator * (const Tensor<1,dim> &p) const for (unsigned int i=0; i Tensor<1,dim>::operator + (const Tensor<1,dim> &p) const { return (Tensor<1,dim>(*this) += p); -}; +} @@ -494,7 +494,7 @@ inline Tensor<1,dim> Tensor<1,dim>::operator - (const Tensor<1,dim> &p) const { return (Tensor<1,dim>(*this) -= p); -}; +} @@ -506,7 +506,7 @@ Tensor<1,dim> Tensor<1,dim>::operator - () const for (unsigned int i=0; i::clear () { for (unsigned int i=0; i::memory_consumption () { return sizeof(Tensor<1,dim>); -}; +} @@ -543,7 +543,7 @@ std::ostream & operator << (std::ostream &out, const Tensor<1,dim> &p) out << p[dim-1]; return out; -}; +} @@ -558,7 +558,7 @@ std::ostream & operator << (std::ostream &out, const Tensor<1,1> &p) out << p[0]; return out; -}; +} @@ -575,7 +575,7 @@ operator * (const Tensor<1,dim> &t, for (unsigned int d=0; d &t, for (unsigned int d=0; d (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; // copying of parameters is done, @@ -4927,7 +4927,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; @@ -5031,7 +5031,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -5141,7 +5141,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5256,7 +5256,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5376,7 +5376,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5502,7 +5502,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5634,7 +5634,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5773,7 +5773,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -5916,7 +5916,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -6067,7 +6067,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; Arg3 arg3 = fun_data->arg3; @@ -6193,7 +6193,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; // copying of parameters is done, @@ -6306,7 +6306,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; @@ -6424,7 +6424,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -6550,7 +6550,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -6683,7 +6683,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -6821,7 +6821,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -6966,7 +6966,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -7119,7 +7119,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -7275,7 +7275,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -7437,7 +7437,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -7606,7 +7606,7 @@ namespace Threads = dynamic_cast (fun_encapsulation->fun_data_base); // copy the parameters - ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; + typename ThisClass::FunPtr fun_ptr = fun_data->fun_ptr; Class *object = fun_data->object; Arg1 arg1 = fun_data->arg1; Arg2 arg2 = fun_data->arg2; @@ -8064,7 +8064,7 @@ namespace Threads -}; // end of implementation of namespace Threads +} // end of implementation of namespace Threads diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 4605c1079c..1ee7da1974 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -49,7 +49,7 @@ DataOutBase::Patch::Patch () : Assert (dim<=spacedim, ExcInvalidCombinationOfDimensions(dim,spacedim)); Assert (spacedim<=3, ExcNotImplemented()); -}; +} @@ -63,13 +63,13 @@ DataOutBase::Patch::memory_consumption () const MemoryConsumption::memory_consumption(n_subdivisions) + MemoryConsumption::memory_consumption(data)); -}; +} DataOutBase::UcdFlags::UcdFlags (const bool write_preamble) : write_preamble (write_preamble) -{}; +{} @@ -79,7 +79,7 @@ DataOutBase::PovrayFlags::PovrayFlags (const bool smooth, smooth (smooth), bicubic_patch(bicubic_patch), external_data(external_data) -{}; +{} DataOutBase::DXFlags::DXFlags (const bool write_multigrid, @@ -93,7 +93,7 @@ void DataOutBase::DXFlags::declare_parameters (ParameterHandler &prm) { prm.declare_entry ("Write multigrid", "true", Patterns::Bool()); prm.declare_entry ("Write neighbors", "true", Patterns::Bool()); -}; +} @@ -101,7 +101,7 @@ void DataOutBase::DXFlags::parse_parameters (ParameterHandler &prm) { write_multigrid = prm.get_bool ("Write multigrid"); write_neighbors = prm.get_bool ("Write neighbors"); -}; +} @@ -111,7 +111,7 @@ DataOutBase::DXFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} @@ -119,14 +119,14 @@ DataOutBase::DXFlags::memory_consumption () const void DataOutBase::UcdFlags::declare_parameters (ParameterHandler &prm) { prm.declare_entry ("Write preamble", "true", Patterns::Bool()); -}; +} void DataOutBase::UcdFlags::parse_parameters (ParameterHandler &prm) { write_preamble = prm.get_bool ("Write preamble"); -}; +} unsigned int @@ -135,17 +135,17 @@ DataOutBase::UcdFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} void DataOutBase::GnuplotFlags::declare_parameters (ParameterHandler &/*prm*/) -{}; +{} void DataOutBase::GnuplotFlags::parse_parameters (ParameterHandler &/*prm*/) -{}; +{} @@ -155,7 +155,7 @@ DataOutBase::GnuplotFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} @@ -168,7 +168,7 @@ void DataOutBase::PovrayFlags::declare_parameters (ParameterHandler &prm) Patterns::Bool()); prm.declare_entry ("Include external file", "true", Patterns::Bool ()); -}; +} @@ -177,7 +177,7 @@ void DataOutBase::PovrayFlags::parse_parameters (ParameterHandler &prm) smooth = prm.get_bool ("Use smooth triangles"); bicubic_patch = prm.get_bool ("Use bicubic patches"); external_data = prm.get_bool ("Include external file"); -}; +} @@ -187,7 +187,7 @@ DataOutBase::PovrayFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} @@ -215,7 +215,7 @@ DataOutBase::EpsFlags::EpsFlags (const unsigned int height_vector, draw_cells(draw_cells), shade_cells(shade_cells), color_function(color_function) -{}; +{} @@ -302,7 +302,7 @@ DataOutBase::EpsFlags::default_color_function (const double x, rgb_values.red = rgb_values.green = rgb_values.blue = 1; return rgb_values; -}; +} @@ -315,7 +315,7 @@ DataOutBase::EpsFlags::grey_scale_color_function (const double x, rgb_values.red = rgb_values.blue = rgb_values.green = (x-xmin)/(xmax-xmin); return rgb_values; -}; +} @@ -328,7 +328,7 @@ DataOutBase::EpsFlags::reverse_grey_scale_color_function (const double x, rgb_values.red = rgb_values.blue = rgb_values.green = 1-(x-xmin)/(xmax-xmin); return rgb_values; -}; +} @@ -337,7 +337,7 @@ bool DataOutBase::EpsCell2d::operator < (const EpsCell2d &e) const // note the "wrong" order in // which we sort the elements return depth > e.depth; -}; +} @@ -367,7 +367,7 @@ void DataOutBase::EpsFlags::declare_parameters (ParameterHandler &prm) Patterns::Bool()); prm.declare_entry ("Color function", "default", Patterns::Selection ("default|grey scale|reverse grey scale")); -}; +} @@ -399,7 +399,7 @@ void DataOutBase::EpsFlags::parse_parameters (ParameterHandler &prm) // already have checked that the // given value is valid Assert (false, ExcInternalError()); -}; +} @@ -409,17 +409,17 @@ DataOutBase::EpsFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} void DataOutBase::GmvFlags::declare_parameters (ParameterHandler &/*prm*/) -{}; +{} void DataOutBase::GmvFlags::parse_parameters (ParameterHandler &/*prm*/) -{}; +{} unsigned int @@ -428,24 +428,24 @@ DataOutBase::GmvFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} DataOutBase::TecplotFlags::TecplotFlags (const char* tecplot_binary_file_name) : tecplot_binary_file_name(tecplot_binary_file_name) { -}; +} void DataOutBase::TecplotFlags::declare_parameters (ParameterHandler &/*prm*/) -{}; +{} void DataOutBase::TecplotFlags::parse_parameters (ParameterHandler &/*prm*/) -{}; +{} unsigned int @@ -454,17 +454,17 @@ DataOutBase::TecplotFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} void DataOutBase::VtkFlags::declare_parameters (ParameterHandler &/*prm*/) -{}; +{} void DataOutBase::VtkFlags::parse_parameters (ParameterHandler &/*prm*/) -{}; +{} unsigned int @@ -473,14 +473,14 @@ DataOutBase::VtkFlags::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} unsigned int DataOutBase::memory_consumption () { return 0; -}; +} @@ -890,7 +890,7 @@ void DataOutBase::write_ucd (const std::vector > &patches, // assert the stream is still ok AssertThrow (out, ExcIO()); -}; +} @@ -1388,7 +1388,7 @@ void DataOutBase::write_dx (const std::vector > &patches, out << "end" << std::endl; // assert the stream is still ok AssertThrow (out, ExcIO()); -}; +} @@ -1676,7 +1676,7 @@ void DataOutBase::write_gnuplot (const std::vector > &patche }; AssertThrow (out, ExcIO()); -}; +} @@ -2038,7 +2038,7 @@ void DataOutBase::write_povray (const std::vector > &patches } AssertThrow (out, ExcIO()); -}; +} @@ -2422,7 +2422,7 @@ void DataOutBase::write_eps (const std::vector > &patches, default: Assert (false, ExcNotImplemented()); }; -}; +} @@ -2736,7 +2736,7 @@ void DataOutBase::write_gmv (const std::vector > &patches, // assert the stream is still ok AssertThrow (out, ExcIO()); -}; +} @@ -3082,7 +3082,7 @@ void DataOutBase::write_tecplot (const std::vector > &patche // assert the stream is still ok AssertThrow (out, ExcIO()); -}; +} @@ -3534,7 +3534,7 @@ void DataOutBase::write_tecplot_binary (const std::vector > delete [] tecVarNames; #endif -}; +} @@ -3863,7 +3863,7 @@ void DataOutBase::write_vtk (const std::vector > &patches, // assert the stream is still ok AssertThrow (out, ExcIO()); -}; +} @@ -3952,7 +3952,7 @@ DataOutBase::write_gmv_reorder_data_vectors (const std::vector::write_dx (std::ostream &out) const { DataOutBase::write_dx (get_patches(), get_dataset_names(), dx_flags, out); -}; +} @@ -3973,7 +3973,7 @@ void DataOutInterface::write_ucd (std::ostream &out) const { DataOutBase::write_ucd (get_patches(), get_dataset_names(), ucd_flags, out); -}; +} @@ -3982,7 +3982,7 @@ void DataOutInterface::write_gnuplot (std::ostream &out) const { DataOutBase::write_gnuplot (get_patches(), get_dataset_names(), gnuplot_flags, out); -}; +} @@ -3991,7 +3991,7 @@ void DataOutInterface::write_povray (std::ostream &out) const { DataOutBase::write_povray (get_patches(), get_dataset_names(), povray_flags, out); -}; +} @@ -4000,7 +4000,7 @@ void DataOutInterface::write_eps (std::ostream &out) const { DataOutBase::write_eps (get_patches(), get_dataset_names(), eps_flags, out); -}; +} @@ -4009,7 +4009,7 @@ void DataOutInterface::write_gmv (std::ostream &out) const { DataOutBase::write_gmv (get_patches(), get_dataset_names(), gmv_flags, out); -}; +} @@ -4018,7 +4018,7 @@ void DataOutInterface::write_tecplot (std::ostream &out) const { DataOutBase::write_tecplot (get_patches(), get_dataset_names(), tecplot_flags, out); -}; +} @@ -4027,7 +4027,7 @@ void DataOutInterface::write_tecplot_binary (std::ostream &out) co { DataOutBase::write_tecplot_binary (get_patches(), get_dataset_names(), tecplot_flags, out); -}; +} @@ -4036,7 +4036,7 @@ void DataOutInterface::write_vtk (std::ostream &out) const { DataOutBase::write_vtk (get_patches(), get_dataset_names(), vtk_flags, out); -}; +} @@ -4090,7 +4090,7 @@ DataOutInterface::write (std::ostream &out, default: Assert (false, ExcNotImplemented()); }; -}; +} @@ -4107,7 +4107,7 @@ template void DataOutInterface::set_flags (const DXFlags &flags) { dx_flags = flags; -}; +} @@ -4115,7 +4115,7 @@ template void DataOutInterface::set_flags (const UcdFlags &flags) { ucd_flags = flags; -}; +} @@ -4123,7 +4123,7 @@ template void DataOutInterface::set_flags (const GnuplotFlags &flags) { gnuplot_flags = flags; -}; +} @@ -4131,7 +4131,7 @@ template void DataOutInterface::set_flags (const PovrayFlags &flags) { povray_flags = flags; -}; +} @@ -4139,7 +4139,7 @@ template void DataOutInterface::set_flags (const EpsFlags &flags) { eps_flags = flags; -}; +} @@ -4147,7 +4147,7 @@ template void DataOutInterface::set_flags (const GmvFlags &flags) { gmv_flags = flags; -}; +} @@ -4155,7 +4155,7 @@ template void DataOutInterface::set_flags (const TecplotFlags &flags) { tecplot_flags = flags; -}; +} @@ -4163,7 +4163,7 @@ template void DataOutInterface::set_flags (const VtkFlags &flags) { vtk_flags = flags; -}; +} @@ -4208,7 +4208,7 @@ DataOutInterface::default_suffix (const OutputFormat output_format Assert (false, ExcNotImplemented()); return ""; }; -}; +} @@ -4247,7 +4247,7 @@ DataOutInterface::parse_output_format (const std::string &format_n // return something invalid return OutputFormat(-1); -}; +} @@ -4353,7 +4353,7 @@ DataOutInterface::memory_consumption () const MemoryConsumption::memory_consumption (gmv_flags) + MemoryConsumption::memory_consumption (tecplot_flags) + MemoryConsumption::memory_consumption (vtk_flags)); -}; +} diff --git a/deal.II/base/source/exceptions.cc b/deal.II/base/source/exceptions.cc index 6862557be8..c49ed82953 100644 --- a/deal.II/base/source/exceptions.cc +++ b/deal.II/base/source/exceptions.cc @@ -27,19 +27,19 @@ ExceptionBase::ExceptionBase () : file(""), line(0), function(""), cond(""), exc("") -{}; +{} ExceptionBase::ExceptionBase (const char* f, const int l, const char *func, const char* c, const char *e) : file(f), line(l), function(func), cond(c), exc(e) -{}; +{} ExceptionBase::~ExceptionBase () throw () -{}; +{} @@ -54,7 +54,7 @@ void ExceptionBase::SetFields (const char* f, function = func; cond = c; exc = e; -}; +} @@ -69,14 +69,14 @@ void ExceptionBase::PrintExcData (std::ostream &out) const << "The name and call sequence of the exception was:" << std::endl << " " << exc << std::endl << "Additional Information: " << std::endl; -}; +} void ExceptionBase::PrintInfo (std::ostream &out) const { out << "(none)" << std::endl; -}; +} @@ -146,7 +146,7 @@ const char * ExceptionBase::what () const throw () std::abort (); return 0; } -}; +} @@ -158,7 +158,7 @@ namespace deal_II_exceptions void set_additional_assert_output (const char * const p) { additional_assert_output = p; - }; + } @@ -245,18 +245,18 @@ namespace deal_II_exceptions } else std::abort (); - }; + } void abort () { std::abort (); - }; + } } -}; +} // from the aclocal file: diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index 3949e15669..1330fb51fd 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -23,12 +23,12 @@ Function::Function (const unsigned int n_components, const double initial_time) : FunctionTime(initial_time), n_components(n_components) -{}; +{} template Function::~Function () -{}; +{} template @@ -37,7 +37,7 @@ double Function::value (const Point &, { Assert (false, ExcPureFunctionCalled()); return 0; -}; +} template @@ -45,7 +45,7 @@ void Function::vector_value (const Point &, Vector &) const { Assert (false, ExcPureFunctionCalled()); -}; +} // if necessary try to work around a bug in the IBM xlC compiler @@ -66,7 +66,7 @@ void Function::value_list (const std::vector > &points, for (unsigned int i=0; ivalue (points[i], component); -}; +} template @@ -81,7 +81,7 @@ void Function::vector_value_list (const std::vector > &points, for (unsigned int i=0; ivector_value (points[i], values[i]); -}; +} template @@ -90,7 +90,7 @@ Tensor<1,dim> Function::gradient (const Point &, { Assert (false, ExcPureFunctionCalled()); return Point(); -}; +} template @@ -98,7 +98,7 @@ void Function::vector_gradient (const Point &, std::vector > &) const { Assert (false, ExcPureFunctionCalled()); -}; +} template @@ -111,7 +111,7 @@ void Function::gradient_list (const std::vector > &points, for (unsigned int i=0; i @@ -189,7 +189,7 @@ Function::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} //------------------------------------------------------------// @@ -210,7 +210,7 @@ double ZeroFunction::value (const Point &, const unsigned int) const { return 0.; -}; +} template @@ -221,7 +221,7 @@ void ZeroFunction::vector_value (const Point &, ExcDimensionMismatch (return_value.size(), this->n_components)); std::fill (return_value.begin(), return_value.end(), 0.0); -}; +} template @@ -232,7 +232,7 @@ void ZeroFunction::value_list (const std::vector > &points, ExcDimensionMismatch(values.size(), points.size())); std::fill (values.begin(), values.end(), 0.); -}; +} template @@ -248,7 +248,7 @@ void ZeroFunction::vector_value_list (const std::vector > &point ExcDimensionMismatch(values[i].size(), this->n_components)); std::fill (values[i].begin(), values[i].end(), 0.); }; -}; +} template @@ -256,7 +256,7 @@ Tensor<1,dim> ZeroFunction::gradient (const Point &, const unsigned int) const { return Tensor<1,dim>(); -}; +} template @@ -268,7 +268,7 @@ void ZeroFunction::vector_gradient (const Point &, for (unsigned int c=0; cn_components; ++c) gradients[c].clear (); -}; +} template @@ -281,7 +281,7 @@ void ZeroFunction::gradient_list (const std::vector > &points, for (unsigned int i=0; i @@ -297,7 +297,7 @@ void ZeroFunction::vector_gradient_list (const std::vector > for (unsigned int c=0; cn_components; ++c) gradients[i][c].clear (); }; -}; +} //------------------------------------------------------------// @@ -307,11 +307,11 @@ ConstantFunction::ConstantFunction (const double value, const unsigned int n_components) : ZeroFunction (n_components), function_value (value) -{}; +{} template -ConstantFunction::~ConstantFunction () {}; +ConstantFunction::~ConstantFunction () {} template @@ -319,7 +319,7 @@ double ConstantFunction::value (const Point &, const unsigned int) const { return function_value; -}; +} template @@ -330,7 +330,7 @@ void ConstantFunction::vector_value (const Point &, ExcDimensionMismatch (return_value.size(), this->n_components)); std::fill (return_value.begin(), return_value.end(), function_value); -}; +} template @@ -342,7 +342,7 @@ void ConstantFunction::value_list (const std::vector > &points, ExcDimensionMismatch(values.size(), points.size())); std::fill (values.begin(), values.end(), function_value); -}; +} template @@ -358,7 +358,7 @@ void ConstantFunction::vector_value_list (const std::vector > &p ExcDimensionMismatch(values[i].size(), this->n_components)); std::fill (values[i].begin(), values[i].end(), function_value); }; -}; +} @@ -369,7 +369,7 @@ ConstantFunction::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} //------------------------------------------------------------// @@ -421,7 +421,7 @@ ComponentSelectFunction::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} // explicit instantiations diff --git a/deal.II/base/source/function_derivative.cc b/deal.II/base/source/function_derivative.cc index 633f194441..81c2dae016 100644 --- a/deal.II/base/source/function_derivative.cc +++ b/deal.II/base/source/function_derivative.cc @@ -205,7 +205,7 @@ FunctionDerivative::memory_consumption () const // only simple data elements, so // use sizeof operator return sizeof (*this); -}; +} diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index fcdba00125..8df7500e34 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -1488,4 +1488,4 @@ namespace Functions template class FourierSineSum<1>; template class FourierSineSum<2>; template class FourierSineSum<3>; -}; +} diff --git a/deal.II/base/source/function_time.cc b/deal.II/base/source/function_time.cc index 13c9ba7d89..365acfae91 100644 --- a/deal.II/base/source/function_time.cc +++ b/deal.II/base/source/function_time.cc @@ -27,10 +27,10 @@ void FunctionTime::set_time (const double new_time) { time = new_time; -}; +} void FunctionTime::advance_time (const double delta_t) { set_time (time+delta_t); -}; +} diff --git a/deal.II/base/source/log.cc b/deal.II/base/source/log.cc index fefd825cfc..f88be35b55 100644 --- a/deal.II/base/source/log.cc +++ b/deal.II/base/source/log.cc @@ -69,7 +69,7 @@ LogStream::attach(std::ostream& o) void LogStream::detach () { file = 0; -}; +} std::ostream& @@ -101,28 +101,28 @@ LogStream::push (const std::string& text) pre += text; pre += std::string(":"); prefixes.push(pre); -}; +} void LogStream::pop () { if (prefixes.size() > 1) prefixes.pop(); -}; +} void LogStream::depth_console(unsigned n) { std_depth = n; -}; +} void LogStream::depth_file(unsigned n) { file_depth = n; -}; +} void @@ -242,4 +242,4 @@ LogStream::memory_consumption () const }; return mem; -}; +} diff --git a/deal.II/base/source/memory_consumption.cc b/deal.II/base/source/memory_consumption.cc index 33e5bbbb3b..329b0c2288 100644 --- a/deal.II/base/source/memory_consumption.cc +++ b/deal.II/base/source/memory_consumption.cc @@ -23,7 +23,7 @@ namespace MemoryConsumption for (unsigned int i=0; ientries.find (entry_string); return ptr->second.first; -}; +} @@ -761,7 +761,7 @@ long int ParameterHandler::get_integer (const std::string &entry_string) const ExcConversionError(s)); return i; -}; +} @@ -775,7 +775,7 @@ double ParameterHandler::get_double (const std::string &entry_string) const ExcConversionError(s)); return d; -}; +} @@ -788,7 +788,7 @@ bool ParameterHandler::get_bool (const std::string &entry_string) const return true; else return false; -}; +} @@ -832,7 +832,7 @@ std::ostream & ParameterHandler::print_parameters (std::ostream &out, }; return out; -}; +} void @@ -843,7 +843,7 @@ ParameterHandler::log_parameters (LogStream &out) log_parameters_section (out); out.pop(); -}; +} @@ -970,7 +970,7 @@ void ParameterHandler::print_parameters_section (std::ostream &out, Assert (false, ExcNotImplemented()); }; }; -}; +} @@ -1008,7 +1008,7 @@ void ParameterHandler::log_parameters_section (LogStream &out) leave_subsection (); out.pop(); }; -}; +} @@ -1141,7 +1141,7 @@ bool ParameterHandler::scan_line (std::string line, std::cerr << "Line " << lineno << ": This line matched nothing known:" << std::endl << " " << line << std::endl; return false; -}; +} @@ -1157,7 +1157,7 @@ ParameterHandler::Section* ParameterHandler::get_present_defaults_subsection () }; return sec; -}; +} @@ -1174,7 +1174,7 @@ const ParameterHandler::Section* ParameterHandler::get_present_defaults_subsecti }; return sec; -}; +} @@ -1190,7 +1190,7 @@ ParameterHandler::Section* ParameterHandler::get_present_changed_subsection () }; return sec; -}; +} @@ -1206,7 +1206,7 @@ const ParameterHandler::Section* ParameterHandler::get_present_changed_subsectio }; return sec; -}; +} @@ -1217,7 +1217,7 @@ ParameterHandler::memory_consumption () const MemoryConsumption::memory_consumption (subsection_path) + MemoryConsumption::memory_consumption (defaults) + MemoryConsumption::memory_consumption (changed_entries)); -}; +} @@ -1239,7 +1239,7 @@ ParameterHandler::Section::~Section () delete p->second; subsections.clear (); -}; +} @@ -1255,19 +1255,19 @@ ParameterHandler::Section::memory_consumption () const mem += (MemoryConsumption::memory_consumption (i->first) + MemoryConsumption::memory_consumption (*(i->second))); return mem; -}; +} MultipleParameterLoop::MultipleParameterLoop() : n_branches(0) -{}; +{} MultipleParameterLoop::~MultipleParameterLoop () -{}; +{} @@ -1279,7 +1279,7 @@ bool MultipleParameterLoop::read_input (std::istream &input) if (x) init_branches (); return x; -}; +} @@ -1290,7 +1290,7 @@ bool MultipleParameterLoop::read_input (const std::string &filename) // function calls // MultipleParameterLoop::Readinput(std::istream &, std::ostream &) // which itself calls init_branches. -}; +} @@ -1299,7 +1299,7 @@ bool MultipleParameterLoop::read_input_from_string (const char *s) bool x = ParameterHandler::read_input (s); init_branches (); return x; -}; +} @@ -1312,7 +1312,7 @@ void MultipleParameterLoop::loop (MultipleParameterLoop::UserClass &uc) fill_entry_values (run_no); uc.run (*this); }; -}; +} @@ -1369,7 +1369,7 @@ void MultipleParameterLoop::init_branches () // other output) for (unsigned int i=0; isecond); leave_subsection (); }; -}; +} @@ -1464,7 +1464,7 @@ void MultipleParameterLoop::fill_entry_values (const unsigned int run_no) possibilities *= choice->different_values.size(); }; -}; +} @@ -1477,7 +1477,7 @@ MultipleParameterLoop::memory_consumption () const mem += multiple_choices[i].memory_consumption (); return mem; -}; +} @@ -1485,7 +1485,7 @@ MultipleParameterLoop::Entry::Entry (const std::vector &ssp, const std::string &Name, const std::string &Value) : subsection_path (ssp), entry_name(Name), entry_value(Value) -{}; +{} @@ -1533,7 +1533,7 @@ void MultipleParameterLoop::Entry::split_different_values () type = Entry::array; else type = Entry::variant; -}; +} unsigned int @@ -1544,4 +1544,4 @@ MultipleParameterLoop::Entry::memory_consumption () const MemoryConsumption::memory_consumption (entry_value) + MemoryConsumption::memory_consumption (different_values) + sizeof (type)); -}; +} diff --git a/deal.II/base/source/polynomial.cc b/deal.II/base/source/polynomial.cc index 2423e4438f..99e5d8659b 100644 --- a/deal.II/base/source/polynomial.cc +++ b/deal.II/base/source/polynomial.cc @@ -30,7 +30,7 @@ namespace { Threads::ThreadMutex coefficients_lock; -}; +} namespace Polynomials @@ -494,7 +494,7 @@ namespace Polynomials v.push_back(LagrangeEquidistant(degree,i)); return v; }; - }; + } @@ -682,7 +682,7 @@ namespace Polynomials for (unsigned int i=0; i<=degree; ++i) v.push_back (Legendre(i)); return v; - }; + } @@ -800,7 +800,7 @@ namespace Polynomials // now, everything is done, so // release the lock again coefficients_lock.release (); - }; + } @@ -821,7 +821,7 @@ namespace Polynomials // change any more once computed, // this is MT safe return *p; - }; + } @@ -842,7 +842,7 @@ namespace Polynomials for (unsigned int i=0; i<=degree; ++i) v.push_back (Hierarchical(i)); return v; - }; + } } diff --git a/deal.II/base/source/polynomial_space.cc b/deal.II/base/source/polynomial_space.cc index fbda5c562d..c596213fc9 100644 --- a/deal.II/base/source/polynomial_space.cc +++ b/deal.II/base/source/polynomial_space.cc @@ -28,7 +28,7 @@ PolynomialSpace::compute_n_pols (const unsigned int n) n_pols /= (i+1); } return n_pols; -}; +} template diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 47dfec0704..54f1ee70d1 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -21,13 +21,13 @@ template <> Quadrature<0>::Quadrature (const unsigned int) : n_quadrature_points(0) -{}; +{} template <> Quadrature<0>::~Quadrature () -{}; +{} @@ -87,7 +87,7 @@ Quadrature<0>::Quadrature (const Quadrature<-1> &, : n_quadrature_points (0) { Assert (false, ExcInternalError()); -}; +} @@ -97,7 +97,7 @@ Quadrature<1>::Quadrature (const Quadrature<0> &, n_quadrature_points (0) { Assert (false, ExcInternalError()); -}; +} @@ -137,13 +137,13 @@ Quadrature::Quadrature (const SubQuadrature &q1, // near that. Assert ((sum>0.999999) && (sum<1.000001), ExcInternalError()); #endif -}; +} template Quadrature::~Quadrature () -{}; +{} @@ -153,7 +153,7 @@ const Point<0> & Quadrature<0>::point (const unsigned int) const Assert (false, ExcInternalError()); static const Point<0> dummy; return dummy; -}; +} @@ -162,7 +162,7 @@ const Point & Quadrature::point (const unsigned int i) const { Assert (i > & Quadrature<0>::get_points () const { Assert (false, ExcInternalError()); return quadrature_points; -}; +} @@ -179,7 +179,7 @@ template const std::vector > & Quadrature::get_points () const { return quadrature_points; -}; +} @@ -188,7 +188,7 @@ double Quadrature<0>::weight (const unsigned int) const { Assert (false, ExcInternalError()); return 0; -}; +} @@ -197,7 +197,7 @@ double Quadrature::weight (const unsigned int i) const { Assert (i const std::vector & Quadrature::get_weights () const { return weights; -}; +} @@ -214,7 +214,7 @@ const std::vector & Quadrature<0>::get_weights () const { Assert (false, ExcInternalError()); return weights; -}; +} @@ -224,7 +224,7 @@ Quadrature::memory_consumption () const { return (MemoryConsumption::memory_consumption (quadrature_points) + MemoryConsumption::memory_consumption (weights)); -}; +} //----------------------------------------------------------------------// @@ -268,7 +268,7 @@ void QProjector<2>::project_to_face (const Quadrature<1> &quadrature, default: Assert (false, ExcInternalError()); }; -}; +} @@ -319,7 +319,7 @@ void QProjector<3>::project_to_face (const Quadrature<2> &quadrature, default: Assert (false, ExcInternalError()); }; -}; +} @@ -406,7 +406,7 @@ void QProjector<2>::project_to_subface (const Quadrature<1> &quadrature, default: Assert (false, ExcInternalError()); }; -}; +} @@ -566,7 +566,7 @@ void QProjector<3>::project_to_subface (const Quadrature<2> &quadrature, default: Assert (false, ExcInternalError()); }; -}; +} @@ -576,7 +576,7 @@ QProjector<1>::project_to_all_faces (const Quadrature<0> &) { Assert (false, ExcImpossibleInDim(1)); return Quadrature<1>(0); -}; +} @@ -617,7 +617,7 @@ QProjector<1>::project_to_all_subfaces (const Quadrature<0> &) { Assert (false, ExcImpossibleInDim(1)); return Quadrature<1>(0); -}; +} @@ -706,7 +706,7 @@ QProjector::project_to_child (const Quadrature &quadrature, weights[i] *= (1./GeometryInfo::children_per_cell); return Quadrature (q_points, weights); -}; +} @@ -728,7 +728,7 @@ QIterated<1>::uses_both_endpoints (const Quadrature<1> &base_quadrature) }; return (at_left && at_right); -}; +} @@ -829,7 +829,7 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature, Assert (std::fabs(sum_of_weights-1) < 1e-15, ExcSumOfWeightsNotOne()); #endif -}; +} @@ -840,7 +840,7 @@ QIterated::QIterated (const Quadrature<1> &base_quadrature, const unsigned int N) : Quadrature (QIterated(base_quadrature, N), QIterated<1>(base_quadrature, N)) -{}; +{} diff --git a/deal.II/base/source/quadrature_lib.cc b/deal.II/base/source/quadrature_lib.cc index 93827e2ec8..edc0d64e64 100644 --- a/deal.II/base/source/quadrature_lib.cc +++ b/deal.II/base/source/quadrature_lib.cc @@ -90,7 +90,7 @@ QGauss2<1>::QGauss2 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -119,7 +119,7 @@ QGauss3<1>::QGauss3 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -152,7 +152,7 @@ QGauss4<1>::QGauss4 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -189,7 +189,7 @@ QGauss5<1>::QGauss5 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -230,7 +230,7 @@ QGauss6<1>::QGauss6 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -275,7 +275,7 @@ QGauss7<1>::QGauss7 () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} @@ -285,7 +285,7 @@ QMidpoint<1>::QMidpoint () : { this->quadrature_points[0] = Point<1>(0.5); this->weights[0] = 1.0; -}; +} template <> @@ -300,7 +300,7 @@ QTrapez<1>::QTrapez () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -315,7 +315,7 @@ QSimpson<1>::QSimpson () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -330,7 +330,7 @@ QMilne<1>::QMilne () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} template <> @@ -347,7 +347,7 @@ QWeddle<1>::QWeddle () : this->quadrature_points[i] = Point<1>(xpts[i]); this->weights[i] = wts[i]; }; -}; +} @@ -357,53 +357,53 @@ QWeddle<1>::QWeddle () : template QGauss::QGauss (const unsigned int n) : Quadrature (QGauss(n), QGauss<1>(n)) -{}; +{} template -QGauss2::QGauss2 () : Quadrature (QGauss2(), QGauss2<1>()) {}; +QGauss2::QGauss2 () : Quadrature (QGauss2(), QGauss2<1>()) {} template QGauss3::QGauss3 () : - Quadrature (QGauss3(), QGauss3<1>()){}; + Quadrature (QGauss3(), QGauss3<1>()){} template QGauss4::QGauss4 () : - Quadrature (QGauss4(), QGauss4<1>()){}; + Quadrature (QGauss4(), QGauss4<1>()){} template QGauss5::QGauss5 () : - Quadrature (QGauss5(), QGauss5<1>()){}; + Quadrature (QGauss5(), QGauss5<1>()){} template QGauss6::QGauss6 () : - Quadrature (QGauss6(), QGauss6<1>()){}; + Quadrature (QGauss6(), QGauss6<1>()){} template QGauss7::QGauss7 () : - Quadrature (QGauss7(), QGauss7<1>()){}; + Quadrature (QGauss7(), QGauss7<1>()){} template QMidpoint::QMidpoint () : - Quadrature (QMidpoint(), QMidpoint<1>()){}; + Quadrature (QMidpoint(), QMidpoint<1>()){} template QTrapez::QTrapez () : - Quadrature (QTrapez(), QTrapez<1>()){}; + Quadrature (QTrapez(), QTrapez<1>()){} template QSimpson::QSimpson () : - Quadrature (QSimpson(), QSimpson<1>()){}; + Quadrature (QSimpson(), QSimpson<1>()){} template QMilne::QMilne () : - Quadrature (QMilne(), QMilne<1>()){}; + Quadrature (QMilne(), QMilne<1>()){} template QWeddle::QWeddle () : - Quadrature (QWeddle(), QWeddle<1>()){}; + Quadrature (QWeddle(), QWeddle<1>()){} // explicit specialization diff --git a/deal.II/base/source/subscriptor.cc b/deal.II/base/source/subscriptor.cc index 73f0ab8d55..c63b85d565 100644 --- a/deal.II/base/source/subscriptor.cc +++ b/deal.II/base/source/subscriptor.cc @@ -28,7 +28,7 @@ namespace // include the huge file into the // file). Threads::ThreadMutex subscription_lock; -}; +} @@ -87,13 +87,13 @@ ActiveObjectMonitor::deregister_object (const Subscriptor *p) Subscriptor::Subscriptor () : counter (0), object_info (0) -{}; +{} Subscriptor::Subscriptor (const Subscriptor &) : counter (0), object_info (0) -{}; +{} Subscriptor::~Subscriptor () @@ -118,7 +118,7 @@ Subscriptor & Subscriptor::operator = (const Subscriptor &s) { object_info = s.object_info; return *this; -}; +} @@ -132,7 +132,7 @@ void Subscriptor::subscribe () const subscription_lock.acquire(); ++counter; subscription_lock.release(); -}; +} void Subscriptor::unsubscribe () const { @@ -140,10 +140,10 @@ void Subscriptor::unsubscribe () const { subscription_lock.acquire(); --counter; subscription_lock.release(); -}; +} unsigned int Subscriptor::n_subscriptions () const { return counter; -}; +} diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index a90138d94d..79e345c3e3 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -27,12 +27,12 @@ template TensorFunction::TensorFunction (const double initial_time) : FunctionTime (initial_time) -{}; +{} template TensorFunction::~TensorFunction () -{}; +{} template @@ -41,7 +41,7 @@ TensorFunction::value (const Point &) const { Assert (false, ExcPureFunctionCalled()); return Tensor(); -}; +} // if necessary try to work around a bug in the IBM xlC compiler @@ -60,7 +60,7 @@ TensorFunction::value_list (const std::vector > &points, for (unsigned int i=0; ivalue (points[i]); -}; +} template @@ -69,7 +69,7 @@ TensorFunction::gradient (const Point &) const { Assert (false, ExcPureFunctionCalled()); return Tensor(); -}; +} template @@ -82,7 +82,7 @@ TensorFunction::gradient_list (const std::vector > &poin for (unsigned int i=0; i; diff --git a/deal.II/base/source/thread_management.cc b/deal.II/base/source/thread_management.cc index febde08068..18548a6b41 100644 --- a/deal.II/base/source/thread_management.cc +++ b/deal.II/base/source/thread_management.cc @@ -40,7 +40,7 @@ namespace Threads n_existing_threads_mutex.acquire (); ++n_existing_threads_counter; n_existing_threads_mutex.release (); - }; + } @@ -51,7 +51,7 @@ namespace Threads Assert (n_existing_threads_counter >= 1, ExcInternalError()); n_existing_threads_mutex.release (); - }; + } @@ -73,7 +73,7 @@ namespace Threads << "---------------------------------------------------------" << std::endl; std::abort (); - }; + } @@ -94,7 +94,7 @@ namespace Threads << "---------------------------------------------------------" << std::endl; std::abort (); - }; + } @@ -104,7 +104,7 @@ namespace Threads const unsigned int n = n_existing_threads_counter; n_existing_threads_mutex.release (); return n; - }; + } #if DEAL_II_USE_MT != 1 @@ -113,7 +113,7 @@ namespace Threads int /*flags*/) const { (*fun_ptr) (fun_data); - }; + } @@ -122,7 +122,7 @@ namespace Threads void *) { Assert (count == 1, ExcBarrierSizeNotUseful(count)); - }; + } #else @@ -267,7 +267,7 @@ namespace Threads FunDataCounter::FunDataCounter () : n_fun_encapsulation_objects (0), n_fun_data_base_objects (0) - {}; + {} @@ -277,7 +277,7 @@ namespace Threads ExcObjectsExist("FunEncapsulation", n_fun_encapsulation_objects)); AssertThrow (n_fun_data_base_objects == 0, ExcObjectsExist("FunDataBase", n_fun_data_base_objects)); - }; + } @@ -295,7 +295,7 @@ namespace Threads // keep some statistics on the // number of variables around ++fun_data_counter.n_fun_encapsulation_objects; - }; + } @@ -305,7 +305,7 @@ namespace Threads // keep some statistics on the // number of variables around ++fun_data_counter.n_fun_encapsulation_objects; - }; + } @@ -315,7 +315,7 @@ namespace Threads // keep some statistics on the // number of variables around ++fun_data_counter.n_fun_encapsulation_objects; - }; + } FunEncapsulation::~FunEncapsulation () @@ -332,7 +332,7 @@ namespace Threads // keep some statistics on the // number of variables around --fun_data_counter.n_fun_encapsulation_objects; - }; + } const FunEncapsulation & @@ -344,7 +344,7 @@ namespace Threads Assert (false, ExcNotImplemented()); const FunEncapsulation * const p = 0; return *p; - }; + } @@ -354,7 +354,7 @@ namespace Threads // keep some statistics on the // number of variables around ++fun_data_counter.n_fun_data_base_objects; - }; + } @@ -364,7 +364,7 @@ namespace Threads // keep some statistics on the // number of variables around ++fun_data_counter.n_fun_data_base_objects; - }; + } @@ -379,7 +379,7 @@ namespace Threads // keep some statistics on the // number of variables around --fun_data_counter.n_fun_data_base_objects; - }; + } @@ -414,7 +414,7 @@ namespace Threads (void*)&fun_data, 0); #endif - }; + } @@ -424,7 +424,7 @@ namespace Threads { for (unsigned int i=0; i::DoFAccessor () : dof_handler(0) { Assert (false, ExcInvalidObject()); -}; +} @@ -40,7 +40,7 @@ template inline DoFAccessor::DoFAccessor (const DoFHandler *dof_handler) : dof_handler(const_cast*>(dof_handler)) -{}; +{} @@ -50,7 +50,7 @@ DoFAccessor::set_dof_handler (DoFHandler *dh) { Assert (dh != 0, ExcInvalidObject()); dof_handler = dh; -}; +} @@ -59,7 +59,7 @@ const DoFHandler & DoFAccessor::get_dof_handler () const { return *dof_handler; -}; +} @@ -70,7 +70,7 @@ DoFAccessor::operator = (const DoFAccessor &da) { this->set_dof_handler (da.dof_handler); return *this; -}; +} @@ -102,7 +102,7 @@ DoFObjectAccessor<1,dim>::dof_index (const unsigned int i) const return this->dof_handler->levels[this->present_level] ->line_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_line+i]; -}; +} template @@ -132,7 +132,7 @@ DoFObjectAccessor<1,dim>::vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); return this->dof_handler->vertex_dofs[dof_number]; -}; +} template @@ -178,7 +178,7 @@ DoFObjectAccessor<1,dim>::get_dof_indices (std::vector &dof_indice *next++ = vertex_dof_index(vertex,d); for (unsigned int d=0; d @@ -196,7 +196,7 @@ DoFObjectAccessor<1,dim>::child (const unsigned int i) const Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); #endif return q; -}; +} template @@ -206,7 +206,7 @@ DoFObjectAccessor<1,dim>::copy_from (const DoFObjectAccessor<1,dim> &a) { BaseClass::copy_from (a); this->set_dof_handler (a.dof_handler); -}; +} /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ @@ -226,7 +226,7 @@ unsigned int DoFObjectAccessor<2,dim>::dof_index (const unsigned int i) const return this->dof_handler->levels[this->present_level] ->quad_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_quad+i]; -}; +} template @@ -247,7 +247,7 @@ DoFObjectAccessor<2,dim>::vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); return this->dof_handler->vertex_dofs[dof_number]; -}; +} // if necessary try to work around a bug in the IBM xlC compiler @@ -296,7 +296,7 @@ DoFObjectAccessor<2,dim>::get_dof_indices (std::vector &dof_indice *next++ = this->line(line)->dof_index(d); for (unsigned int d=0; d @@ -313,7 +313,7 @@ DoFObjectAccessor<2,dim>::line (const unsigned int i) const this->line_index (i), this->dof_handler ); -}; +} template @@ -331,7 +331,7 @@ DoFObjectAccessor<2,dim>::child (const unsigned int i) const Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); #endif return q; -}; +} template @@ -341,7 +341,7 @@ DoFObjectAccessor<2,dim>::copy_from (const DoFObjectAccessor<2,dim> &a) { BaseClass::copy_from (a); this->set_dof_handler (a.dof_handler); -}; +} /*------------------------- Functions: DoFObjectAccessor<3,dim> -----------------------*/ @@ -363,7 +363,7 @@ DoFObjectAccessor<3,dim>::dof_index (const unsigned int i) const return this->dof_handler->levels[this->present_level] ->hex_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_hex+i]; -}; +} template @@ -384,7 +384,7 @@ DoFObjectAccessor<3,dim>::vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); return this->dof_handler->vertex_dofs[dof_number]; -}; +} template @@ -431,7 +431,7 @@ DoFObjectAccessor<3,dim>::get_dof_indices (std::vector &dof_indice *next++ = this->quad(quad)->dof_index(d); for (unsigned int d=0; d::line (const unsigned int i) const l->index(), this->dof_handler ); -}; +} template @@ -465,7 +465,7 @@ DoFObjectAccessor<3,dim>::quad (const unsigned int i) const this->quad_index (i), this->dof_handler ); -}; +} template @@ -483,7 +483,7 @@ DoFObjectAccessor<3,dim>::child (const unsigned int i) const Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); #endif return q; -}; +} template @@ -491,7 +491,7 @@ void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) { BaseClass::copy_from (a); this->set_dof_handler (a.dof_handler); -}; +} /*------------------------- Functions: DoFCellAccessor -----------------------*/ @@ -512,7 +512,7 @@ DoFCellAccessor::neighbor (const unsigned int i) const Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsNeighbor()); #endif return q; -}; +} template @@ -530,7 +530,7 @@ DoFCellAccessor::child (const unsigned int i) const Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); #endif return q; -}; +} #endif diff --git a/deal.II/deal.II/include/dofs/dof_constraints.templates.h b/deal.II/deal.II/include/dofs/dof_constraints.templates.h index f04bea11ac..26b9a86794 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.templates.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.templates.h @@ -145,7 +145,7 @@ ConstraintMatrix::condense (const SparseMatrix &uncondensed, ++next_constraint; }; -}; +} @@ -258,7 +258,7 @@ ConstraintMatrix::condense (SparseMatrix &uncondensed) const }; }; }; -}; +} @@ -440,7 +440,7 @@ ConstraintMatrix::condense (BlockSparseMatrix &uncondensed) const }; }; }; -}; +} @@ -514,7 +514,7 @@ ConstraintMatrix::condense (const VectorType &uncondensed, ++next_constraint; }; -}; +} @@ -545,7 +545,7 @@ ConstraintMatrix::condense (VectorType &vec) const // nothing more to do break; }; -}; +} @@ -571,7 +571,7 @@ ConstraintMatrix::set_zero (VectorType &vec) const // nothing more to do break; }; -}; +} @@ -644,7 +644,7 @@ ConstraintMatrix::distribute (const VectorType &condensed, next_constraint->entries[i].second); ++next_constraint; }; -}; +} @@ -665,7 +665,7 @@ ConstraintMatrix::distribute (VectorType &vec) const vec(next_constraint->line) += (vec(next_constraint->entries[i].first) * next_constraint->entries[i].second); }; -}; +} #endif diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index c744388bd9..03ab817b8c 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -1285,7 +1285,7 @@ inline unsigned int DoFHandler::n_dofs () const { return used_dofs; -}; +} @@ -1295,7 +1295,7 @@ const FiniteElement & DoFHandler::get_fe () const { Assert(selected_fe!=0, ExcNoFESelected()); return *selected_fe; -}; +} /*---------------------------- dof.h ---------------------------*/ diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 336899f67a..e82bcc8b60 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1268,7 +1268,7 @@ map_support_points_to_dofs (const Mapping &mapping, point_to_index_map.clear (); for (unsigned int i=0; i::n_dofs_per_vertex () const { return dofs_per_vertex; -}; +} template @@ -1578,7 +1578,7 @@ unsigned int FiniteElementData::n_dofs_per_line () const { return dofs_per_line; -}; +} template @@ -1587,7 +1587,7 @@ unsigned int FiniteElementData::n_dofs_per_quad () const { return dofs_per_quad; -}; +} template @@ -1596,7 +1596,7 @@ unsigned int FiniteElementData::n_dofs_per_hex () const { return dofs_per_hex; -}; +} template @@ -1605,7 +1605,7 @@ unsigned int FiniteElementData::n_dofs_per_face () const { return dofs_per_face; -}; +} template @@ -1614,7 +1614,7 @@ unsigned int FiniteElementData::n_dofs_per_cell () const { return dofs_per_cell; -}; +} template @@ -1623,7 +1623,7 @@ unsigned int FiniteElementData::n_components () const { return components; -}; +} @@ -1712,7 +1712,7 @@ FiniteElementBase::face_system_to_component_index (const unsigned int index typename FiniteElementBase::ExcShapeFunctionNotPrimitive(index)); return face_system_to_component_table[index]; -}; +} @@ -1737,7 +1737,7 @@ FiniteElementBase::face_system_to_base_index (const unsigned int index) con Assert(index < face_system_to_base_table.size(), ExcIndexRange(index, 0, face_system_to_base_table.size())); return face_system_to_base_table[index]; -}; +} @@ -1771,7 +1771,7 @@ FiniteElementBase::get_nonzero_components (const unsigned int i) const { Assert (i < this->dofs_per_cell, ExcIndexRange (i, 0, this->dofs_per_cell)); return nonzero_components[i]; -}; +} @@ -1782,7 +1782,7 @@ FiniteElementBase::n_nonzero_components (const unsigned int i) const { Assert (i < this->dofs_per_cell, ExcIndexRange (i, 0, this->dofs_per_cell)); return n_nonzero_components_table[i]; -}; +} @@ -1803,7 +1803,7 @@ FiniteElementBase::is_primitive (const unsigned int i) const // probably more expensive than // just comparing against 1 return (n_nonzero_components_table[i] == 1); -}; +} template @@ -1812,7 +1812,7 @@ bool FiniteElementBase::is_primitive () const { return cached_primitivity; -}; +} diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index dd482eeab4..69bac18a00 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -1291,7 +1291,7 @@ FEValuesBase::shape_grad (const unsigned int i, // component the call of this // function refers return this->shape_gradients[this->shape_function_to_row_table[i]][j]; -}; +} @@ -1489,7 +1489,7 @@ const Quadrature & FEValues::get_quadrature () const { return quadrature; -}; +} /*------------------------ Inline functions: FEFaceValuesBase --------------------*/ @@ -1501,10 +1501,10 @@ FEFaceValuesBase::normal_vector (const unsigned int i) const { Assert (inormal_vectors.size(), ExcIndexRange(i, 0, this->normal_vectors.size())); Assert (this->update_flags & update_normal_vectors, - FEValuesBase::ExcAccessToUninitializedField()); + typename FEValuesBase::ExcAccessToUninitializedField()); return this->normal_vectors[i]; -}; +} template @@ -1513,7 +1513,7 @@ typename DoFHandler::face_iterator FEFaceValuesBase::get_face() const { return present_face; -}; +} @@ -1523,7 +1523,7 @@ const Quadrature & FEFaceValuesBase::get_quadrature () const { return quadrature; -}; +} diff --git a/deal.II/deal.II/include/fe/mapping.h b/deal.II/deal.II/include/fe/mapping.h index b1a02a7750..c8edba439c 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -550,7 +550,7 @@ Mapping::InternalDataBase::current_update_flags () const } else return update_each; -}; +} @@ -560,7 +560,7 @@ bool Mapping::InternalDataBase::is_first_cell () const { return first_cell; -}; +} @@ -570,7 +570,7 @@ void Mapping::InternalDataBase::clear_first_cell () { first_cell = false; -}; +} #endif diff --git a/deal.II/deal.II/include/grid/geometry_info.h b/deal.II/deal.II/include/grid/geometry_info.h index 3237421dbb..ffcd162a3c 100644 --- a/deal.II/deal.II/include/grid/geometry_info.h +++ b/deal.II/deal.II/include/grid/geometry_info.h @@ -821,7 +821,7 @@ GeometryInfo<1>::unit_cell_vertex (const unsigned int vertex) const Point vertices[vertices_per_cell] = { Point(0.), Point(1.) }; return vertices[vertex]; -}; +} @@ -836,7 +836,7 @@ GeometryInfo<2>::unit_cell_vertex (const unsigned int vertex) { Point(0., 0.), Point(1., 0.), Point(1.,1.), Point(0.,1.) }; return vertices[vertex]; -}; +} @@ -853,7 +853,7 @@ GeometryInfo<3>::unit_cell_vertex (const unsigned int vertex) Point(0., 1., 0.), Point(1., 1., 0.), Point(1., 1., 1.), Point(0., 1., 1.) }; return vertices[vertex]; -}; +} @@ -868,7 +868,7 @@ GeometryInfo<1>::vertices_adjacent_to_line (const unsigned int line, ExcIndexRange (vertex, 0, 2)); return vertex; -}; +} @@ -886,7 +886,7 @@ GeometryInfo<2>::vertices_adjacent_to_line (const unsigned int line, { {0, 1}, {1, 2}, {3, 2}, {0, 3} }; return vertex_indices[line][vertex]; -}; +} @@ -906,7 +906,7 @@ GeometryInfo<3>::vertices_adjacent_to_line (const unsigned int line, {0, 4}, {1, 5}, {2, 6}, {3, 7} }; return vertex_indices[line][vertex]; -}; +} diff --git a/deal.II/deal.II/include/grid/grid_out.h b/deal.II/deal.II/include/grid/grid_out.h index c47609fa1d..7e6d3a9dd2 100644 --- a/deal.II/deal.II/include/grid/grid_out.h +++ b/deal.II/deal.II/include/grid/grid_out.h @@ -376,7 +376,7 @@ namespace GridOutFlags const double azimut_angle = 60, const double turn_angle = 30); }; -}; +} diff --git a/deal.II/deal.II/include/grid/grid_tools.h b/deal.II/deal.II/include/grid/grid_tools.h index d0655de4be..ec5323391d 100644 --- a/deal.II/deal.II/include/grid/grid_tools.h +++ b/deal.II/deal.II/include/grid/grid_tools.h @@ -188,7 +188,7 @@ void GridTools::transform (const Predicate &predicate, // and mark it as treated treated_vertices[cell->vertex_index(v)] = true; }; -}; +} diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index 6afe09b621..1cf38c6d6b 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -36,7 +36,7 @@ TriaAccessor::copy_from (const TriaAccessor &a) present_level = a.present_level; present_index = a.present_index; tria = a.tria; -}; +} @@ -48,7 +48,7 @@ TriaAccessor::operator == (const TriaAccessor &a) const Assert (tria == a.tria, ExcCantCompareIterators()); return ((present_index == a.present_index) && (present_level == a.present_level)); -}; +} @@ -60,7 +60,7 @@ TriaAccessor::operator != (const TriaAccessor &a) const Assert (tria == a.tria, ExcCantCompareIterators()); return ((present_index != a.present_index) || (present_level != a.present_level)); -}; +} @@ -70,7 +70,7 @@ int TriaAccessor::level () const { return present_level; -}; +} @@ -80,7 +80,7 @@ int TriaAccessor::index () const { return present_index; -}; +} @@ -96,7 +96,7 @@ TriaAccessor::state () const return IteratorState::past_the_end; else return IteratorState::invalid; -}; +} @@ -106,7 +106,7 @@ const Triangulation & TriaAccessor::get_triangulation () const { return *tria; -}; +} /*------------------------ Functions: LineAccessor ---------------------------*/ @@ -120,7 +120,7 @@ TriaObjectAccessor<1,dim>::used () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return this->tria->levels[this->present_level]->lines.used[this->present_index]; -}; +} @@ -131,7 +131,7 @@ TriaObjectAccessor<1,dim>::user_flag_set () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->lines.user_flags[this->present_index]; -}; +} @@ -142,7 +142,7 @@ TriaObjectAccessor<1,dim>::set_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->lines.user_flags[this->present_index] = true; -}; +} @@ -153,7 +153,7 @@ TriaObjectAccessor<1,dim>::clear_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->lines.user_flags[this->present_index] = false; -}; +} @@ -171,7 +171,7 @@ TriaObjectAccessor<1,dim>::child (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsChild()); return q; -}; +} @@ -182,7 +182,7 @@ TriaObjectAccessor<1,dim>::child_index (unsigned const int i) const { Assert (i<2, ExcIndexRange(i,0,2)); return this->tria->levels[this->present_level]->lines.children[this->present_index]+i; -}; +} @@ -209,7 +209,7 @@ TriaObjectAccessor<1,dim>::max_refinement_depth () const const unsigned int depths[2] = { child(0)->max_refinement_depth() + 1, child(1)->max_refinement_depth() + 1 }; return std::max (depths[0], depths[1]); -}; +} @@ -237,7 +237,7 @@ TriaObjectAccessor<1,dim>::operator ++ () return; }; }; -}; +} @@ -263,7 +263,7 @@ TriaObjectAccessor<1,dim>::operator -- () // else this->present_index = this->tria->levels[this->present_level]->lines.lines.size()-1; }; -}; +} /*------------------------ Functions: QuadAccessor ---------------------------*/ @@ -277,7 +277,7 @@ TriaObjectAccessor<2,dim>::used () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return this->tria->levels[this->present_level]->quads.used[this->present_index]; -}; +} @@ -288,7 +288,7 @@ TriaObjectAccessor<2,dim>::user_flag_set () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->quads.user_flags[this->present_index]; -}; +} @@ -299,7 +299,7 @@ TriaObjectAccessor<2,dim>::set_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->quads.user_flags[this->present_index] = true; -}; +} @@ -310,7 +310,7 @@ TriaObjectAccessor<2,dim>::clear_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->quads.user_flags[this->present_index] = false; -}; +} @@ -326,7 +326,7 @@ TriaObjectAccessor<2,dim>::line (const unsigned int i) const this->present_level, line_index (i) ); -}; +} @@ -338,7 +338,7 @@ TriaObjectAccessor<2,dim>::line_index (const unsigned int i) const Assert (i<4, ExcIndexRange(i,0,4)); return this->tria->levels[this->present_level]->quads.quads[this->present_index].line(i); -}; +} @@ -356,7 +356,7 @@ TriaObjectAccessor<2,dim>::child (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsChild()); return q; -}; +} @@ -366,7 +366,7 @@ int TriaObjectAccessor<2,dim>::child_index (const unsigned int i) const { Assert (i<4, ExcIndexRange(i,0,4)); return this->tria->levels[this->present_level]->quads.children[this->present_index]+i; -}; +} @@ -378,7 +378,7 @@ TriaObjectAccessor<2,dim>::has_children () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return (this->tria->levels[this->present_level]->quads.children[this->present_index] != -1); -}; +} @@ -396,7 +396,7 @@ TriaObjectAccessor<2,dim>::max_refinement_depth () const child(3)->max_refinement_depth() + 1 }; return std::max (std::max (depths[0], depths[1]), std::max (depths[2], depths[3])); -}; +} @@ -423,7 +423,7 @@ TriaObjectAccessor<2,dim>::operator ++ () return; }; }; -}; +} @@ -449,7 +449,7 @@ TriaObjectAccessor<2,dim>::operator -- () // else this->present_index = this->tria->levels[this->present_level]->quads.quads.size()-1; }; -}; +} /*------------------------ Functions: HexAccessor ---------------------------*/ @@ -463,7 +463,7 @@ TriaObjectAccessor<3,dim>::used () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return this->tria->levels[this->present_level]->hexes.used[this->present_index]; -}; +} @@ -474,7 +474,7 @@ TriaObjectAccessor<3,dim>::user_flag_set () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->hexes.user_flags[this->present_index]; -}; +} @@ -485,7 +485,7 @@ TriaObjectAccessor<3,dim>::set_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = true; -}; +} @@ -495,7 +495,7 @@ void TriaObjectAccessor<3,dim>::clear_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = false; -}; +} @@ -534,7 +534,7 @@ TriaObjectAccessor<3,dim>::line (const unsigned int i) const }; Assert (false, ExcIndexRange(i,0,12)); return TriaIterator >(this->tria, -1, -1, 0); -}; +} @@ -551,7 +551,7 @@ TriaObjectAccessor<3,dim>::quad (const unsigned int i) const this->present_level, quad_index (i) ); -}; +} @@ -581,7 +581,7 @@ TriaObjectAccessor<3,dim>::line_index (const unsigned int i) const }; Assert (false, ExcIndexRange(i,0,12)); return 0; -}; +} @@ -593,7 +593,7 @@ TriaObjectAccessor<3,dim>::quad_index (const unsigned int i) const Assert (i<6, ExcIndexRange(i,0,6)); return this->tria->levels[this->present_level]->hexes.hexes[this->present_index].quad(i); -}; +} @@ -610,7 +610,7 @@ TriaObjectAccessor<3,dim>::child (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsChild()); return q; -}; +} @@ -620,7 +620,7 @@ int TriaObjectAccessor<3,dim>::child_index (const unsigned int i) const { Assert (i<8, ExcIndexRange(i,0,8)); return this->tria->levels[this->present_level]->hexes.children[this->present_index]+i; -}; +} @@ -630,7 +630,7 @@ bool TriaObjectAccessor<3,dim>::has_children () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return (this->tria->levels[this->present_level]->hexes.children[this->present_index] != -1); -}; +} @@ -654,7 +654,7 @@ TriaObjectAccessor<3,dim>::max_refinement_depth () const std::max (depths[2], depths[3])), std::max (std::max (depths[4], depths[5]), std::max (depths[6], depths[7]))); -}; +} @@ -681,7 +681,7 @@ TriaObjectAccessor<3,dim>::operator ++ () return; }; }; -}; +} @@ -707,7 +707,7 @@ TriaObjectAccessor<3,dim>::operator -- () // else this->present_index = this->tria->levels[this->present_level]->hexes.hexes.size()-1; }; -}; +} /*------------------------ Functions: TriaObjectAccessor ---------------------------*/ @@ -721,7 +721,7 @@ TriaObjectAccessor::used () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return this->tria->levels[this->present_level]->hexes.used[this->present_index]; -}; +} @@ -732,7 +732,7 @@ TriaObjectAccessor::user_flag_set () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); return this->tria->levels[this->present_level]->hexes.user_flags[this->present_index]; -}; +} @@ -743,7 +743,7 @@ TriaObjectAccessor::set_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = true; -}; +} @@ -753,7 +753,7 @@ void TriaObjectAccessor::clear_user_flag () const { Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = false; -}; +} @@ -800,7 +800,7 @@ TriaObjectAccessor::line (const unsigned int i) const } return TriaIterator >(this->tria, -1, -1, 0); -}; +} @@ -819,7 +819,7 @@ TriaObjectAccessor::quad (const unsigned int i) const this->present_level, quad_index (i) ); -}; +} @@ -859,7 +859,7 @@ TriaObjectAccessor::line_index (const unsigned int i) const Assert(false, ExcNotImplemented()); } return 0; -}; +} @@ -872,7 +872,7 @@ TriaObjectAccessor::quad_index (const unsigned int i) const ExcIndexRange(i,0,GeometryInfo::quads_per_cell)); return this->tria->levels[this->present_level]->hexes.hexes[this->present_index].quad(i); -}; +} @@ -891,7 +891,7 @@ TriaObjectAccessor::child (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsChild()); return q; -}; +} @@ -902,7 +902,7 @@ int TriaObjectAccessor::child_index (const unsigned int i) const Assert (i < GeometryInfo::children_per_cell, ExcIndexRange(i,0,GeometryInfo::children_per_cell)); return this->tria->levels[this->present_level]->hexes.children[this->present_index]+i; -}; +} @@ -912,7 +912,7 @@ bool TriaObjectAccessor::has_children () const Assert (this->state() == IteratorState::valid, typename TriaAccessor::ExcDereferenceInvalidObject()); return (this->tria->levels[this->present_level]->hexes.children[this->present_index] != -1); -}; +} @@ -936,7 +936,7 @@ TriaObjectAccessor::max_refinement_depth () const std::max (depths[2], depths[3])), std::max (std::max (depths[4], depths[5]), std::max (depths[6], depths[7]))); -}; +} @@ -963,7 +963,7 @@ TriaObjectAccessor::operator ++ () return; }; }; -}; +} @@ -989,7 +989,7 @@ TriaObjectAccessor::operator -- () // else this->present_index = this->tria->levels[this->present_level]->hexes.hexes.size()-1; }; -}; +} /*------------------------ Functions: CellAccessor -----------------------*/ @@ -1002,7 +1002,7 @@ CellAccessor<1>::face (const unsigned int) const { Assert (false, TriaAccessor<1>::ExcNotUsefulForThisDimension()); return TriaIterator<1,TriaObjectAccessor<0, 1> >(); -}; +} @@ -1012,7 +1012,7 @@ Triangulation<2>::face_iterator CellAccessor<2>::face (const unsigned int i) const { return this->line(i); -}; +} @@ -1022,7 +1022,7 @@ Triangulation<3>::face_iterator CellAccessor<3>::face (const unsigned int i) const { return this->quad(i); -}; +} @@ -1035,7 +1035,7 @@ CellAccessor::neighbor_index (const unsigned int i) const typename TriaAccessor::ExcInvalidNeighbor(i)); return this->tria->levels[this->present_level]-> neighbors[this->present_index*GeometryInfo::faces_per_cell+i].second; -}; +} @@ -1048,7 +1048,7 @@ CellAccessor::neighbor_level (const unsigned int i) const typename TriaAccessor::ExcInvalidNeighbor(i)); return this->tria->levels[this->present_level]-> neighbors[this->present_index*GeometryInfo::faces_per_cell+i].first; -}; +} @@ -1066,7 +1066,7 @@ CellAccessor::refine_flag_set () const Assert (this->active() || !this->tria->levels[this->present_level]->refine_flags[this->present_index], ExcRefineCellNotActive()); return this->tria->levels[this->present_level]->refine_flags[this->present_index]; -}; +} @@ -1080,7 +1080,7 @@ CellAccessor::set_refine_flag () const ExcCellFlaggedForCoarsening()); this->tria->levels[this->present_level]->refine_flags[this->present_index] = true; -}; +} @@ -1091,7 +1091,7 @@ CellAccessor::clear_refine_flag () const { Assert (this->used() && this->active(), ExcRefineCellNotActive()); this->tria->levels[this->present_level]->refine_flags[this->present_index] = false; -}; +} @@ -1109,7 +1109,7 @@ CellAccessor::coarsen_flag_set () const Assert (this->active() || !this->tria->levels[this->present_level]->coarsen_flags[this->present_index], ExcRefineCellNotActive()); return this->tria->levels[this->present_level]->coarsen_flags[this->present_index]; -}; +} @@ -1122,7 +1122,7 @@ CellAccessor::set_coarsen_flag () const Assert (!refine_flag_set(), ExcCellFlaggedForRefinement()); this->tria->levels[this->present_level]->coarsen_flags[this->present_index] = true; -}; +} @@ -1133,7 +1133,7 @@ CellAccessor::clear_coarsen_flag () const { Assert (this->used() && this->active(), ExcRefineCellNotActive()); this->tria->levels[this->present_level]->coarsen_flags[this->present_index] = false; -}; +} @@ -1149,7 +1149,7 @@ CellAccessor::neighbor (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsNeighbor()); return q; -}; +} @@ -1165,7 +1165,7 @@ CellAccessor::child (const unsigned int i) const typename TriaAccessor::ExcUnusedCellAsChild()); return q; -}; +} @@ -1175,7 +1175,7 @@ bool CellAccessor::active () const { return !this->has_children(); -}; +} #endif diff --git a/deal.II/deal.II/include/grid/tria_hex.h b/deal.II/deal.II/include/grid/tria_hex.h index 6558a742bb..67f093479e 100644 --- a/deal.II/deal.II/include/grid/tria_hex.h +++ b/deal.II/deal.II/include/grid/tria_hex.h @@ -98,7 +98,7 @@ Hexahedron::Hexahedron (const int i0, const int i1, quads[3] = i3; quads[4] = i4; quads[5] = i5; -}; +} @@ -108,7 +108,7 @@ int Hexahedron::quad (const int i) const Assert ((i>=0) && (i<6), ExcRange(i)); return quads[i]; -}; +} @@ -118,7 +118,7 @@ void Hexahedron::set_quad (const int i, const int index) Assert ((i>=0) && (i<6), ExcRange(i)); quads[i] = index; -}; +} @@ -127,6 +127,6 @@ unsigned int Hexahedron::memory_consumption () { return sizeof(Hexahedron); -}; +} #endif diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index 2f906ef8c2..835b92035f 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -871,7 +871,7 @@ template inline TriaRawIterator::TriaRawIterator (const Accessor &a) : accessor (a) -{}; +{} @@ -880,7 +880,7 @@ template inline TriaRawIterator::TriaRawIterator (const TriaRawIterator &i) : accessor (i.accessor) -{}; +{} @@ -892,7 +892,7 @@ TriaRawIterator::operator * () const Assert (state() == IteratorState::valid, ExcDereferenceInvalidObject(accessor)); return accessor; -}; +} @@ -904,7 +904,7 @@ TriaRawIterator::operator * () Assert (state() == IteratorState::valid, ExcDereferenceInvalidObject(accessor)); return accessor; -}; +} @@ -914,7 +914,7 @@ const Accessor * TriaRawIterator::operator -> () const { return &(this->operator* ()); -}; +} @@ -924,7 +924,7 @@ Accessor * TriaRawIterator::operator -> () { return &(this->operator* ()); -}; +} @@ -934,7 +934,7 @@ IteratorState::IteratorStates TriaRawIterator::state () const { return accessor.state (); -}; +} @@ -957,7 +957,7 @@ TriaRawIterator::operator < (const TriaRawIterator &i) const (i.state()==IteratorState::valid) ) || ((state()==IteratorState::valid) && (i.state()==IteratorState::past_the_end))); -}; +} template @@ -969,7 +969,7 @@ TriaRawIterator::operator ++ () ++accessor; return *this; -}; +} @@ -982,7 +982,7 @@ TriaRawIterator::operator -- () --accessor; return *this; -}; +} @@ -992,7 +992,7 @@ void TriaRawIterator::print (std::ostream &out) const { out << accessor.level() << "." << accessor.index(); -}; +} @@ -1002,7 +1002,7 @@ unsigned int TriaRawIterator::memory_consumption () const { return sizeof(TriaRawIterator); -}; +} @@ -1011,7 +1011,7 @@ template inline TriaIterator::TriaIterator (const TriaIterator &i) : TriaRawIterator (static_cast >(i)) -{}; +{} @@ -1032,7 +1032,7 @@ TriaIterator::TriaIterator (const TriaRawIteratoraccessor.used(), ExcAssignmentOfUnusedObject()); #endif -}; +} @@ -1041,7 +1041,7 @@ template inline TriaActiveIterator::TriaActiveIterator (const TriaActiveIterator &i) : TriaIterator (static_cast >(i)) -{}; +{} @@ -1062,7 +1062,7 @@ TriaActiveIterator::TriaActiveIterator (const TriaRawIteratoraccessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif -}; +} @@ -1081,7 +1081,7 @@ std::ostream & operator << (std::ostream &out, { i.print(out); return out; -}; +} @@ -1100,7 +1100,7 @@ std::ostream & operator << (std::ostream &out, { i.print(out); return out; -}; +} @@ -1119,7 +1119,7 @@ std::ostream & operator << (std::ostream &out, { i.print(out); return out; -}; +} 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 c8b4b63a81..04f3d3fc1e 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -31,13 +31,13 @@ template inline TriaRawIterator::TriaRawIterator () : - accessor (0, -2, -2, 0) {}; + accessor (0, -2, -2, 0) {} template inline TriaRawIterator::TriaRawIterator (const TriaRawIterator &i) : - accessor (i.accessor) {}; + accessor (i.accessor) {} template @@ -46,7 +46,7 @@ TriaRawIterator::TriaRawIterator (const Triangulation *parent const int level, const int index, const typename Accessor::AccessorData *local_data) : - accessor (parent, level, index, local_data) {}; + accessor (parent, level, index, local_data) {} template @@ -56,7 +56,7 @@ TriaRawIterator::operator = (const TriaRawIterator & accessor.copy_from (i.accessor); return *this; -}; +} template @@ -64,7 +64,7 @@ inline bool TriaRawIterator::operator == (const TriaRawIterator &i) const { return accessor == i.accessor; -}; +} template @@ -83,7 +83,7 @@ TriaRawIterator::operator != (const TriaRawIterator // // Work around the problem this way: return accessor.operator != (i.accessor); -}; +} template @@ -94,7 +94,7 @@ TriaRawIterator::operator ++ (int) { operator++ (); return tmp; -}; +} template @@ -105,7 +105,7 @@ TriaRawIterator::operator -- (int) { operator-- (); return tmp; -}; +} /*----------------------- functions: TriaIterator ---------------*/ @@ -114,13 +114,13 @@ TriaRawIterator::operator -- (int) { template inline TriaIterator::TriaIterator () : - TriaRawIterator () {}; + TriaRawIterator () {} template inline TriaIterator::TriaIterator (const TriaIterator &i) : - TriaRawIterator (static_cast >(i)) {}; + TriaRawIterator (static_cast >(i)) {} template @@ -139,7 +139,7 @@ TriaIterator::TriaIterator (const TriaRawIterator &i Assert (this->accessor.used(), ExcAssignmentOfUnusedObject()); #endif -}; +} template @@ -161,7 +161,7 @@ TriaIterator::TriaIterator (const Triangulation *parent, Assert (this->accessor.used(), ExcAssignmentOfUnusedObject()); #endif -}; +} template @@ -170,7 +170,7 @@ TriaIterator & TriaIterator::operator = (const TriaIterator &i) { this->accessor.copy_from (i.accessor); return *this; -}; +} template @@ -190,7 +190,7 @@ TriaIterator::operator = (const TriaRawIterator &i) ExcAssignmentOfUnusedObject()); #endif return *this; -}; +} template @@ -201,7 +201,7 @@ TriaIterator & TriaIterator::operator ++ () { if (this->accessor.used() == true) return *this; return *this; -}; +} template @@ -211,7 +211,7 @@ TriaIterator TriaIterator::operator ++ (int) { operator++ (); return tmp; -}; +} template @@ -223,7 +223,7 @@ TriaIterator::operator -- () { if (this->accessor.used() == true) return *this; return *this; -}; +} template @@ -234,7 +234,7 @@ TriaIterator::operator -- (int) { operator-- (); return tmp; -}; +} /*----------------------- functions: TriaActiveIterator ---------------*/ @@ -243,13 +243,13 @@ TriaIterator::operator -- (int) { template inline TriaActiveIterator::TriaActiveIterator () : - TriaIterator () {}; + TriaIterator () {} template inline TriaActiveIterator::TriaActiveIterator (const TriaActiveIterator &i) : - TriaIterator (static_cast >(i)) {}; + TriaIterator (static_cast >(i)) {} template @@ -268,7 +268,7 @@ TriaActiveIterator::TriaActiveIterator (const TriaRawIteratoraccessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif -}; +} template @@ -287,7 +287,7 @@ TriaActiveIterator::TriaActiveIterator (const TriaIteratoraccessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif -}; +} template @@ -309,7 +309,7 @@ TriaActiveIterator::TriaActiveIterator (const Triangulation * Assert (this->accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif -}; +} template @@ -318,7 +318,7 @@ TriaActiveIterator & TriaActiveIterator::operator = (const TriaActiveIterator &i) { this->accessor.copy_from (i.accessor); return *this; -}; +} template @@ -338,7 +338,7 @@ TriaActiveIterator::operator = (const TriaRawIterator @@ -358,7 +358,7 @@ TriaActiveIterator::operator = (const TriaIterator & ExcAssignmentOfInactiveObject()); #endif return *this; -}; +} template @@ -370,7 +370,7 @@ TriaActiveIterator::operator ++ () { if (this->accessor.has_children() == false) return *this; return *this; -}; +} template @@ -381,7 +381,7 @@ TriaActiveIterator::operator ++ (int) { operator++ (); return tmp; -}; +} template @@ -393,7 +393,7 @@ TriaActiveIterator::operator -- () { if (this->accessor.has_children() == false) return *this; return *this; -}; +} template @@ -403,7 +403,7 @@ TriaActiveIterator TriaActiveIterator::operator -- ( operator-- (); return tmp; -}; +} #endif diff --git a/deal.II/deal.II/include/grid/tria_iterator_base.h b/deal.II/deal.II/include/grid/tria_iterator_base.h index 7da1415a3d..c1a2af4b4b 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_base.h +++ b/deal.II/deal.II/include/grid/tria_iterator_base.h @@ -34,7 +34,7 @@ namespace IteratorState past_the_end, invalid }; -}; +} diff --git a/deal.II/deal.II/include/grid/tria_line.h b/deal.II/deal.II/include/grid/tria_line.h index 8ce1d9e386..669157bdea 100644 --- a/deal.II/deal.II/include/grid/tria_line.h +++ b/deal.II/deal.II/include/grid/tria_line.h @@ -84,7 +84,7 @@ Line::Line (const int i0, const int i1) { end_points[0] = i0; end_points[1] = i1; -}; +} @@ -94,7 +94,7 @@ int Line::vertex (const int i) const Assert ((i==0) || (i==1), ExcRange(i)); return end_points[i]; -}; +} @@ -104,7 +104,7 @@ void Line::set_vertex (const int i, const int index) Assert ((i==0) || (i==1), ExcRange(i)); end_points[i] = index; -}; +} @@ -113,7 +113,7 @@ unsigned int Line::memory_consumption () { return sizeof(Line); -}; +} #endif diff --git a/deal.II/deal.II/include/grid/tria_quad.h b/deal.II/deal.II/include/grid/tria_quad.h index baad4fae31..4111e46a7c 100644 --- a/deal.II/deal.II/include/grid/tria_quad.h +++ b/deal.II/deal.II/include/grid/tria_quad.h @@ -90,7 +90,7 @@ Quad::Quad (const int i0, const int i1, const int i2, const int i3) lines[1] = i1; lines[2] = i2; lines[3] = i3; -}; +} @@ -100,7 +100,7 @@ int Quad::line (const int i) const Assert ((i>=0) && (i<4), ExcRange(i)); return lines[i]; -}; +} @@ -110,7 +110,7 @@ void Quad::set_line (const int i, const int index) Assert ((i>=0) && (i<4), ExcRange(i)); lines[i] = index; -}; +} @@ -119,6 +119,6 @@ unsigned int Quad::memory_consumption () { return sizeof(Quad); -}; +} #endif diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index 968e55b585..1cfb583fd1 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -336,7 +336,7 @@ MGLevelObject::MGLevelObject(const unsigned int min, minlevel(0) { resize (min, max); -}; +} template @@ -369,7 +369,7 @@ MGLevelObject::resize (const unsigned int new_minlevel, minlevel = new_minlevel; objects.resize (new_maxlevel - new_minlevel + 1); -}; +} template @@ -379,7 +379,7 @@ MGLevelObject::clear () typename std::vector::iterator v; for (v = objects.begin(); v != objects.end(); ++v) v->clear(); -}; +} template @@ -387,7 +387,7 @@ unsigned int MGLevelObject::get_minlevel () const { return minlevel; -}; +} template @@ -395,7 +395,7 @@ unsigned int MGLevelObject::get_maxlevel () const { return minlevel + objects.size() - 1; -}; +} /*----------------------------------------------------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index 46d1e77326..17842817a8 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -78,7 +78,7 @@ class MGDoFAccessor { * Reset the DoF handler pointer. */ void set_mg_dof_handler (MGDoFHandler *dh) { - Assert (dh != 0, DoFAccessor::ExcInvalidObject()); + Assert (dh != 0, typename DoFAccessor::ExcInvalidObject()); mg_dof_handler = dh; }; diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 9e98adaf68..33e220e3b3 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -1126,7 +1126,7 @@ void MGDoFHandler::MGVertexDoFs::set_index (const unsigned int level, ExcIndexRange(dof_number, 0, dofs_per_vertex)); indices[(level-coarsest_level)*dofs_per_vertex + dof_number] = index; -}; +} template @@ -1141,7 +1141,7 @@ MGDoFHandler::MGVertexDoFs::get_index (const unsigned int level, ExcIndexRange (dof_number, 0, dofs_per_vertex)); return indices[(level-coarsest_level)*dofs_per_vertex + dof_number]; -}; +} template <> diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index 207900d974..cb1b87311f 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -253,7 +253,7 @@ inline void MGSmootherIdentity::smooth ( const unsigned int, VECTOR&, const VECTOR&) 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 81ebfd1a50..fb56334d44 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.templates.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.templates.h @@ -30,7 +30,7 @@ MGSmootherRelaxation matrix(&matrix), relaxation(relaxation), omega(omega) -{}; +{} template diff --git a/deal.II/deal.II/include/numerics/time_dependent.h b/deal.II/deal.II/include/numerics/time_dependent.h index 4930e1cc42..1476f7a4de 100644 --- a/deal.II/deal.II/include/numerics/time_dependent.h +++ b/deal.II/deal.II/include/numerics/time_dependent.h @@ -1545,7 +1545,7 @@ namespace TimeStepBase_Tria_Flags double, << "The following value does not fulfill the requirements: " << arg1); }; -}; +} @@ -1975,7 +1975,7 @@ void TimeDependent::do_loop (InitFunctionObject init_function, timesteps[n_timesteps-(step-look_back)-1]->sleep(look_back); break; }; -}; +} /*---------------------------- time-dependent.h ---------------------------*/ diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index ed61c5aaba..6067fa0624 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -34,16 +34,18 @@ template void DoFObjectAccessor<1, dim>::set_dof_index (const unsigned int i, const unsigned int index) const { - Assert (this->dof_handler != 0, DoFAccessor::ExcInvalidObject()); + Assert (this->dof_handler != 0, + typename DoFAccessor::ExcInvalidObject()); // make sure a FE has been selected // and enough room was reserved - Assert (this->dof_handler->selected_fe != 0, DoFAccessor::ExcInvalidObject()); + Assert (this->dof_handler->selected_fe != 0, + typename DoFAccessor::ExcInvalidObject()); Assert (idof_handler->selected_fe->dofs_per_line, ExcIndexRange (i, 0, this->dof_handler->selected_fe->dofs_per_line)); this->dof_handler->levels[this->present_level] ->line_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_line+i] = index; -}; +} @@ -76,7 +78,7 @@ void DoFObjectAccessor<1, dim>::set_vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); this->dof_handler->vertex_dofs[dof_number] = index; -}; +} @@ -115,7 +117,7 @@ distribute_local_to_global (const Vector &local_source, // distribute cell vector for (unsigned int j=0; j &local_source, for (unsigned int i=0; i::get_dof_values (const InputVector &values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} @@ -221,7 +223,7 @@ DoFObjectAccessor<1,dim>::set_dof_values (const Vector &local_values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ @@ -242,7 +244,7 @@ void DoFObjectAccessor<2, dim>::set_dof_index (const unsigned int i, this->dof_handler->levels[this->present_level] ->quad_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_quad+i] = index; -}; +} @@ -264,7 +266,7 @@ DoFObjectAccessor<2, dim>::set_vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); this->dof_handler->vertex_dofs[dof_number] = index; -}; +} @@ -292,7 +294,7 @@ distribute_local_to_global (const Vector &local_source, // distribute cell vector for (unsigned int j=0; j &local_source, for (unsigned int i=0; i::get_dof_values (const InputVector &values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} @@ -401,7 +403,7 @@ DoFObjectAccessor<2,dim>::set_dof_values (const Vector &local_values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} /*------------------------- Functions: DoFObjectAccessor<3,dim> -----------------------*/ @@ -422,7 +424,7 @@ void DoFObjectAccessor<3, dim>::set_dof_index (const unsigned int i, this->dof_handler->levels[this->present_level] ->hex_dofs[this->present_index*this->dof_handler->selected_fe->dofs_per_hex+i] = index; -}; +} @@ -444,7 +446,7 @@ void DoFObjectAccessor<3, dim>::set_vertex_dof_index (const unsigned int vertex, this->dof_handler->selected_fe->dofs_per_vertex + i); this->dof_handler->vertex_dofs[dof_number] = index; -}; +} @@ -474,7 +476,7 @@ distribute_local_to_global (const Vector &local_source, // distribute cell vector for (unsigned int j=0; j &local_source, for (unsigned int i=0; i::get_dof_values (const InputVector &values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} @@ -591,7 +593,7 @@ DoFObjectAccessor<3,dim>::set_dof_values (const Vector &local_values, Assert (next_local_value == local_values.end(), ExcInternalError()); -}; +} @@ -606,7 +608,7 @@ DoFCellAccessor<1>::face (const unsigned int) const { Assert (false, ExcNotUsefulForThisDimension()); return TriaIterator<1, DoFObjectAccessor<0,1> >(); -}; +} #endif @@ -618,7 +620,7 @@ TriaIterator<2, DoFObjectAccessor<1,2> > DoFCellAccessor<2>::face (const unsigned int i) const { return this->line(i); -}; +} #endif @@ -630,7 +632,7 @@ TriaIterator<3, DoFObjectAccessor<2, 3> > DoFCellAccessor<3>::face (const unsigned int i) const { return this->quad(i); -}; +} #endif @@ -645,12 +647,14 @@ DoFCellAccessor::get_interpolated_dof_values (const InputVector &values, const unsigned int dofs_per_cell = fe.dofs_per_cell; - Assert (this->dof_handler != 0, DoFAccessor::ExcInvalidObject()); - Assert (&fe != 0, DoFAccessor::ExcInvalidObject()); + Assert (this->dof_handler != 0, + typename DoFAccessor::ExcInvalidObject()); + Assert (&fe != 0, + typename DoFAccessor::ExcInvalidObject()); Assert (interpolated_values.size() == dofs_per_cell, - DoFAccessor::ExcVectorDoesNotMatch()); + typename DoFAccessor::ExcVectorDoesNotMatch()); Assert (values.size() == this->dof_handler->n_dofs(), - DoFAccessor::ExcVectorDoesNotMatch()); + typename DoFAccessor::ExcVectorDoesNotMatch()); if (!this->has_children()) // if this cell has no children: simply @@ -737,7 +741,7 @@ DoFCellAccessor::get_interpolated_dof_values (const InputVector &values, interpolated_values(i) = tmp2(i); }; }; -}; +} @@ -749,12 +753,14 @@ DoFCellAccessor::set_dof_values_by_interpolation (const Vector &loc { const unsigned int dofs_per_cell = this->dof_handler->get_fe().dofs_per_cell; - Assert (this->dof_handler != 0, DoFAccessor::ExcInvalidObject()); - Assert (&this->dof_handler->get_fe() != 0, DoFAccessor::ExcInvalidObject()); + Assert (this->dof_handler != 0, + typename DoFAccessor::ExcInvalidObject()); + Assert (&this->dof_handler->get_fe() != 0, + typename DoFAccessor::ExcInvalidObject()); Assert (local_values.size() == dofs_per_cell, - DoFAccessor::ExcVectorDoesNotMatch()); + typename DoFAccessor::ExcVectorDoesNotMatch()); Assert (values.size() == this->dof_handler->n_dofs(), - DoFAccessor::ExcVectorDoesNotMatch()); + typename DoFAccessor::ExcVectorDoesNotMatch()); if (!this->has_children()) // if this cell has no children: simply @@ -774,7 +780,7 @@ DoFCellAccessor::set_dof_values_by_interpolation (const Vector &loc this->child(child)->set_dof_values_by_interpolation (tmp, values); }; }; -}; +} diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 96c3f44b66..24d817fda4 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -41,7 +41,7 @@ bool ConstraintMatrix::check_zero_weight (const std::pair &p) { return (p.second == 0); -}; +} @@ -50,7 +50,7 @@ bool ConstraintMatrix::ConstraintLine::operator < (const ConstraintLine &a) const { return line < a.line; -}; +} @@ -59,7 +59,7 @@ bool ConstraintMatrix::ConstraintLine::operator == (const ConstraintLine &a) const { return line == a.line; -}; +} @@ -68,14 +68,14 @@ ConstraintMatrix::ConstraintLine::memory_consumption () const { return (MemoryConsumption::memory_consumption (line) + MemoryConsumption::memory_consumption (entries)); -}; +} ConstraintMatrix::ConstraintMatrix () : lines(), sorted(false) -{}; +{} void ConstraintMatrix::add_line (const unsigned int line) @@ -92,7 +92,7 @@ void ConstraintMatrix::add_line (const unsigned int line) // list lines.push_back (ConstraintLine()); lines.back().line = line; -}; +} @@ -135,7 +135,7 @@ void ConstraintMatrix::add_entry (const unsigned int line, }; line_ptr->entries.push_back (std::make_pair(column,value)); -}; +} @@ -185,7 +185,7 @@ void ConstraintMatrix::add_entries (const unsigned int li line_ptr->entries.push_back (*col_val_pair); }; -}; +} @@ -246,7 +246,7 @@ void ConstraintMatrix::close () #endif sorted = true; -}; +} @@ -446,7 +446,7 @@ void ConstraintMatrix::merge (const ConstraintMatrix &other_constraints) // state if (object_was_sorted == true) close (); -}; +} @@ -455,7 +455,7 @@ void ConstraintMatrix::clear () std::vector tmp; lines.swap (tmp); sorted = false; -}; +} @@ -565,7 +565,7 @@ void ConstraintMatrix::condense (const SparsityPattern &uncondensed, }; condensed.compress(); -}; +} @@ -679,7 +679,7 @@ void ConstraintMatrix::condense (SparsityPattern &sparsity) const }; sparsity.compress(); -}; +} @@ -812,7 +812,7 @@ void ConstraintMatrix::condense (CompressedSparsityPattern &sparsity) const .entries[q].first); }; }; -}; +} @@ -955,7 +955,7 @@ void ConstraintMatrix::condense (BlockSparsityPattern &sparsity) const }; sparsity.compress(); -}; +} @@ -1087,14 +1087,14 @@ void ConstraintMatrix::condense (CompressedBlockSparsityPattern &sparsity) const }; }; }; -}; +} unsigned int ConstraintMatrix::n_constraints () const { return lines.size(); -}; +} @@ -1118,7 +1118,7 @@ bool ConstraintMatrix::is_constrained (const unsigned int index) const return false; }; -}; +} @@ -1147,7 +1147,7 @@ bool ConstraintMatrix::is_identity_constrained (const unsigned int index) const return false; }; -}; +} @@ -1163,7 +1163,7 @@ unsigned int ConstraintMatrix::max_constraint_indirections () const static_cast(i->entries.size())); return return_value; -}; +} @@ -1176,7 +1176,7 @@ void ConstraintMatrix::print (std::ostream &out) const << ": " << lines[i].entries[j].second << std::endl; AssertThrow (out, ExcIO()); -}; +} @@ -1185,7 +1185,7 @@ ConstraintMatrix::memory_consumption () const { return (MemoryConsumption::memory_consumption (lines) + MemoryConsumption::memory_consumption (sorted)); -}; +} @@ -1216,19 +1216,19 @@ ConstraintMatrix::memory_consumption () const #define VectorType Vector -vector_functions; +vector_functions #undef VectorType #define VectorType Vector -vector_functions; +vector_functions #undef VectorType #define VectorType BlockVector -vector_functions; +vector_functions #undef VectorType #define VectorType BlockVector -vector_functions; +vector_functions #undef VectorType diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 92579f38f2..4626b33176 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -44,7 +44,7 @@ template DoFHandler::DoFHandler (const Triangulation &tria) : tria(&tria), used_dofs (0) -{}; +{} template @@ -52,7 +52,7 @@ DoFHandler::~DoFHandler () { // release allocated memory clear (); -}; +} #if deal_II_dimension == 1 @@ -61,70 +61,70 @@ template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::begin_raw (const unsigned int level) const { return begin_raw_line (level); -}; +} template <> DoFHandler<1>::cell_iterator DoFHandler<1>::begin (const unsigned int level) const { return begin_line (level); -}; +} template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::begin_active (const unsigned int level) const { return begin_active_line (level); -}; +} template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::end () const { return end_line (); -}; +} template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::last_raw () const { return last_raw_line (); -}; +} template <> DoFHandler<1>::raw_cell_iterator DoFHandler<1>::last_raw (const unsigned int level) const { return last_raw_line (level); -}; +} template <> DoFHandler<1>::cell_iterator DoFHandler<1>::last () const { return last_line (); -}; +} template <> DoFHandler<1>::cell_iterator DoFHandler<1>::last (const unsigned int level) const { return last_line (level); -}; +} template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::last_active () const { return last_active_line (); -}; +} template <> DoFHandler<1>::active_cell_iterator DoFHandler<1>::last_active (const unsigned int level) const { return last_active_line (level); -}; +} template <> @@ -132,7 +132,7 @@ DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::begin_raw_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -140,7 +140,7 @@ DoFDimensionInfo<1>::face_iterator DoFHandler<1>::begin_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -148,7 +148,7 @@ DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::begin_active_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -156,7 +156,7 @@ DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::end_face () const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -164,7 +164,7 @@ DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face () const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -172,7 +172,7 @@ DoFDimensionInfo<1>::raw_face_iterator DoFHandler<1>::last_raw_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -180,7 +180,7 @@ DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face () const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -188,7 +188,7 @@ DoFDimensionInfo<1>::face_iterator DoFHandler<1>::last_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -196,7 +196,7 @@ DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face () const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -204,7 +204,7 @@ DoFDimensionInfo<1>::active_face_iterator DoFHandler<1>::last_active_face (const unsigned int) const { Assert (false, ExcFunctionNotUseful()); return 0; -}; +} template <> @@ -212,7 +212,7 @@ DoFHandler<1>::raw_quad_iterator DoFHandler<1>::begin_raw_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -220,7 +220,7 @@ DoFHandler<1>::quad_iterator DoFHandler<1>::begin_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -228,7 +228,7 @@ DoFHandler<1>::active_quad_iterator DoFHandler<1>::begin_active_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -236,7 +236,7 @@ DoFHandler<1>::raw_quad_iterator DoFHandler<1>::end_quad () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -244,7 +244,7 @@ DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -252,7 +252,7 @@ DoFHandler<1>::quad_iterator DoFHandler<1>::last_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -260,7 +260,7 @@ DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -268,7 +268,7 @@ DoFHandler<1>::raw_quad_iterator DoFHandler<1>::last_raw_quad () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -276,7 +276,7 @@ DoFHandler<1>::quad_iterator DoFHandler<1>::last_quad () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -284,7 +284,7 @@ DoFHandler<1>::active_quad_iterator DoFHandler<1>::last_active_quad () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -292,7 +292,7 @@ DoFHandler<1>::raw_hex_iterator DoFHandler<1>::begin_raw_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -300,7 +300,7 @@ DoFHandler<1>::hex_iterator DoFHandler<1>::begin_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -308,7 +308,7 @@ DoFHandler<1>::active_hex_iterator DoFHandler<1>::begin_active_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -316,7 +316,7 @@ DoFHandler<1>::raw_hex_iterator DoFHandler<1>::end_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -324,7 +324,7 @@ DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -332,7 +332,7 @@ DoFHandler<1>::raw_hex_iterator DoFHandler<1>::last_raw_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -340,7 +340,7 @@ DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -348,7 +348,7 @@ DoFHandler<1>::hex_iterator DoFHandler<1>::last_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -356,7 +356,7 @@ DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -364,7 +364,7 @@ DoFHandler<1>::active_hex_iterator DoFHandler<1>::last_active_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} #endif @@ -375,140 +375,140 @@ template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::begin_raw (const unsigned int level) const { return begin_raw_quad (level); -}; +} template <> DoFHandler<2>::cell_iterator DoFHandler<2>::begin (const unsigned int level) const { return begin_quad (level); -}; +} template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::begin_active (const unsigned int level) const { return begin_active_quad (level); -}; +} template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::end () const { return end_quad (); -}; +} template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::last_raw () const { return last_raw_quad (); -}; +} template <> DoFHandler<2>::raw_cell_iterator DoFHandler<2>::last_raw (const unsigned int level) const { return last_raw_quad (level); -}; +} template <> DoFHandler<2>::cell_iterator DoFHandler<2>::last () const { return last_quad (); -}; +} template <> DoFHandler<2>::cell_iterator DoFHandler<2>::last (const unsigned int level) const { return last_quad (level); -}; +} template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::last_active () const { return last_active_quad (); -}; +} template <> DoFHandler<2>::active_cell_iterator DoFHandler<2>::last_active (const unsigned int level) const { return last_active_quad (level); -}; +} template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::begin_raw_face (const unsigned int level) const { return begin_raw_line (level); -}; +} template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::begin_face (const unsigned int level) const { return begin_line (level); -}; +} template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::begin_active_face (const unsigned int level) const { return begin_active_line (level); -}; +} template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::end_face () const { return end_line (); -}; +} template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::last_raw_face () const { return last_raw_line (); -}; +} template <> DoFDimensionInfo<2>::raw_face_iterator DoFHandler<2>::last_raw_face (const unsigned int level) const { return last_raw_line (level); -}; +} template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::last_face () const { return last_line (); -}; +} template <> DoFDimensionInfo<2>::face_iterator DoFHandler<2>::last_face (const unsigned int level) const { return last_line (level); -}; +} template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::last_active_face () const { return last_active_line (); -}; +} template <> DoFDimensionInfo<2>::active_face_iterator DoFHandler<2>::last_active_face (const unsigned int level) const { return last_active_line (level); -}; +} template <> @@ -516,7 +516,7 @@ DoFHandler<2>::raw_hex_iterator DoFHandler<2>::begin_raw_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -524,7 +524,7 @@ DoFHandler<2>::hex_iterator DoFHandler<2>::begin_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -532,7 +532,7 @@ DoFHandler<2>::active_hex_iterator DoFHandler<2>::begin_active_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -540,7 +540,7 @@ DoFHandler<2>::raw_hex_iterator DoFHandler<2>::end_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -548,7 +548,7 @@ DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -556,7 +556,7 @@ DoFHandler<2>::raw_hex_iterator DoFHandler<2>::last_raw_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -564,7 +564,7 @@ DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -572,7 +572,7 @@ DoFHandler<2>::hex_iterator DoFHandler<2>::last_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -580,7 +580,7 @@ DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex (const unsigned int) const { Assert (false, ExcNotImplemented()); return 0; -}; +} template <> @@ -588,7 +588,7 @@ DoFHandler<2>::active_hex_iterator DoFHandler<2>::last_active_hex () const { Assert (false, ExcNotImplemented()); return 0; -}; +} #endif @@ -600,140 +600,140 @@ template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::begin_raw (const unsigned int level) const { return begin_raw_hex (level); -}; +} template <> DoFHandler<3>::cell_iterator DoFHandler<3>::begin (const unsigned int level) const { return begin_hex (level); -}; +} template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::begin_active (const unsigned int level) const { return begin_active_hex (level); -}; +} template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::end () const { return end_hex (); -}; +} template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::last_raw () const { return last_raw_hex (); -}; +} template <> DoFHandler<3>::raw_cell_iterator DoFHandler<3>::last_raw (const unsigned int level) const { return last_raw_hex (level); -}; +} template <> DoFHandler<3>::cell_iterator DoFHandler<3>::last () const { return last_hex (); -}; +} template <> DoFHandler<3>::cell_iterator DoFHandler<3>::last (const unsigned int level) const { return last_hex (level); -}; +} template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::last_active () const { return last_active_hex (); -}; +} template <> DoFHandler<3>::active_cell_iterator DoFHandler<3>::last_active (const unsigned int level) const { return last_active_hex (level); -}; +} template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::begin_raw_face (const unsigned int level) const { return begin_raw_quad (level); -}; +} template <> DoFHandler<3>::face_iterator DoFHandler<3>::begin_face (const unsigned int level) const { return begin_quad (level); -}; +} template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::begin_active_face (const unsigned int level) const { return begin_active_quad (level); -}; +} template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::end_face () const { return end_quad (); -}; +} template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::last_raw_face () const { return last_raw_quad (); -}; +} template <> DoFHandler<3>::raw_face_iterator DoFHandler<3>::last_raw_face (const unsigned int level) const { return last_raw_quad (level); -}; +} template <> DoFHandler<3>::face_iterator DoFHandler<3>::last_face () const { return last_quad (); -}; +} template <> DoFHandler<3>::face_iterator DoFHandler<3>::last_face (const unsigned int level) const { return last_quad (level); -}; +} template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::last_active_face () const { return last_active_quad (); -}; +} template <> DoFHandler<3>::active_face_iterator DoFHandler<3>::last_active_face (const unsigned int level) const { return last_active_quad (level); -}; +} #endif @@ -746,7 +746,7 @@ DoFHandler::begin_raw_line (const unsigned int level) const { tria->begin_raw_line(level)->level(), tria->begin_raw_line(level)->index(), this); -}; +} template @@ -756,7 +756,7 @@ DoFHandler::begin_line (const unsigned int level) const { tria->begin_line(level)->level(), tria->begin_line(level)->index(), this); -}; +} template @@ -766,7 +766,7 @@ DoFHandler::begin_active_line (const unsigned int level) const { tria->begin_active_line(level)->level(), tria->begin_active_line(level)->index(), this); -}; +} template @@ -776,7 +776,7 @@ DoFHandler::begin_raw_quad (const unsigned int level) const { tria->begin_raw_quad(level)->level(), tria->begin_raw_quad(level)->index(), this); -}; +} template @@ -786,7 +786,7 @@ DoFHandler::begin_quad (const unsigned int level) const { tria->begin_quad(level)->level(), tria->begin_quad(level)->index(), this); -}; +} template @@ -796,7 +796,7 @@ DoFHandler::begin_active_quad (const unsigned int level) const { tria->begin_active_quad(level)->level(), tria->begin_active_quad(level)->index(), this); -}; +} template @@ -806,7 +806,7 @@ DoFHandler::begin_raw_hex (const unsigned int level) const { tria->begin_raw_hex(level)->level(), tria->begin_raw_hex(level)->index(), this); -}; +} template @@ -816,7 +816,7 @@ DoFHandler::begin_hex (const unsigned int level) const { tria->begin_hex(level)->level(), tria->begin_hex(level)->index(), this); -}; +} template @@ -826,28 +826,28 @@ DoFHandler::begin_active_hex (const unsigned int level) const { tria->begin_active_hex(level)->level(), tria->begin_active_hex(level)->index(), this); -}; +} template typename DoFHandler::raw_line_iterator DoFHandler::end_line () const { return raw_line_iterator (tria, -1, -1, this); -}; +} template typename DoFHandler::raw_quad_iterator DoFHandler::end_quad () const { return raw_quad_iterator (tria, -1, -1, this); -}; +} template typename DoFHandler::raw_hex_iterator DoFHandler::end_hex () const { return raw_hex_iterator (tria, -1, -1, this); -}; +} template @@ -856,7 +856,7 @@ DoFHandler::end_raw (const unsigned int level) const { return (level == levels.size()-1 ? end() : begin_raw (level+1)); -}; +} template @@ -865,7 +865,7 @@ DoFHandler::end (const unsigned int level) const { return (level == levels.size()-1 ? cell_iterator(end()) : begin (level+1)); -}; +} template @@ -874,7 +874,7 @@ DoFHandler::end_active (const unsigned int level) const { return (level == levels.size()-1 ? active_cell_iterator(end()) : begin_active (level+1)); -}; +} template @@ -883,7 +883,7 @@ DoFHandler::end_raw_face (const unsigned int level) const { return (level == levels.size()-1 ? end_face() : begin_raw_face (level+1)); -}; +} template @@ -892,7 +892,7 @@ DoFHandler::end_face (const unsigned int level) const { return (level == levels.size()-1 ? face_iterator(end_face()) : begin_face (level+1)); -}; +} template @@ -901,7 +901,7 @@ DoFHandler::end_active_face (const unsigned int level) const { return (level == levels.size()-1 ? active_face_iterator(end_face()) : begin_active_face (level+1)); -}; +} template @@ -910,7 +910,7 @@ DoFHandler::end_raw_line (const unsigned int level) const { return (level == levels.size()-1 ? end_line() : begin_raw_line (level+1)); -}; +} template @@ -919,7 +919,7 @@ DoFHandler::end_line (const unsigned int level) const { return (level == levels.size()-1 ? line_iterator(end_line()) : begin_line (level+1)); -}; +} template @@ -928,7 +928,7 @@ DoFHandler::end_active_line (const unsigned int level) const { return (level == levels.size()-1 ? active_line_iterator(end_line()) : begin_active_line (level+1)); -}; +} template @@ -937,7 +937,7 @@ DoFHandler::end_raw_quad (const unsigned int level) const { return (level == levels.size()-1 ? end_quad() : begin_raw_quad (level+1)); -}; +} template @@ -946,7 +946,7 @@ DoFHandler::end_quad (const unsigned int level) const { return (level == levels.size()-1 ? quad_iterator(end_quad()) : begin_quad (level+1)); -}; +} template @@ -955,7 +955,7 @@ DoFHandler::end_active_quad (const unsigned int level) const { return (level == levels.size()-1 ? active_quad_iterator(end_quad()) : begin_active_quad (level+1)); -}; +} template @@ -964,7 +964,7 @@ DoFHandler::end_raw_hex (const unsigned int level) const { return (level == levels.size()-1 ? end_hex() : begin_raw_hex (level+1)); -}; +} template @@ -973,7 +973,7 @@ DoFHandler::end_hex (const unsigned int level) const { return (level == levels.size()-1 ? hex_iterator(end_hex()) : begin_hex (level+1)); -}; +} template @@ -982,7 +982,7 @@ DoFHandler::end_active_hex (const unsigned int level) const { return (level == levels.size()-1 ? active_hex_iterator(end_hex()) : begin_active_hex (level+1)); -}; +} template @@ -992,7 +992,7 @@ DoFHandler::last_raw_line (const unsigned int level) const { tria->last_raw_line(level)->level(), tria->last_raw_line(level)->index(), this); -}; +} template @@ -1002,7 +1002,7 @@ DoFHandler::last_line (const unsigned int level) const { tria->last_line(level)->level(), tria->last_line(level)->index(), this); -}; +} template @@ -1012,7 +1012,7 @@ DoFHandler::last_active_line (const unsigned int level) const { tria->last_active_line(level)->level(), tria->last_active_line(level)->index(), this); -}; +} template @@ -1022,7 +1022,7 @@ DoFHandler::last_raw_quad (const unsigned int level) const { tria->last_raw_quad(level)->level(), tria->last_raw_quad(level)->index(), this); -}; +} template @@ -1032,7 +1032,7 @@ DoFHandler::last_quad (const unsigned int level) const { tria->last_quad(level)->level(), tria->last_quad(level)->index(), this); -}; +} template @@ -1042,7 +1042,7 @@ DoFHandler::last_active_quad (const unsigned int level) const { tria->last_active_quad(level)->level(), tria->last_active_quad(level)->index(), this); -}; +} template @@ -1052,7 +1052,7 @@ DoFHandler::last_raw_hex (const unsigned int level) const { tria->last_raw_hex(level)->level(), tria->last_raw_hex(level)->index(), this); -}; +} template @@ -1062,7 +1062,7 @@ DoFHandler::last_hex (const unsigned int level) const { tria->last_hex(level)->level(), tria->last_hex(level)->index(), this); -}; +} template @@ -1072,70 +1072,70 @@ DoFHandler::last_active_hex (const unsigned int level) const { tria->last_active_hex(level)->level(), tria->last_active_hex(level)->index(), this); -}; +} template typename DoFHandler::raw_line_iterator DoFHandler::last_raw_line () const { return last_raw_line (levels.size()-1); -}; +} template typename DoFHandler::raw_quad_iterator DoFHandler::last_raw_quad () const { return last_raw_quad (levels.size()-1); -}; +} template typename DoFHandler::raw_hex_iterator DoFHandler::last_raw_hex () const { return last_raw_hex (levels.size()-1); -}; +} template typename DoFHandler::line_iterator DoFHandler::last_line () const { return last_line (levels.size()-1); -}; +} template typename DoFHandler::quad_iterator DoFHandler::last_quad () const { return last_quad (levels.size()-1); -}; +} template typename DoFHandler::hex_iterator DoFHandler::last_hex () const { return last_hex (levels.size()-1); -}; +} template typename DoFHandler::active_line_iterator DoFHandler::last_active_line () const { return last_active_line (levels.size()-1); -}; +} template typename DoFHandler::active_quad_iterator DoFHandler::last_active_quad () const { return last_active_quad (levels.size()-1); -}; +} template typename DoFHandler::active_hex_iterator DoFHandler::last_active_hex () const { return last_active_hex (levels.size()-1); -}; +} //------------------------------------------------------------------ @@ -1148,7 +1148,7 @@ unsigned int DoFHandler<1>::n_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); return 2*selected_fe->dofs_per_vertex; -}; +} @@ -1166,7 +1166,7 @@ unsigned int DoFHandler<1>::n_boundary_dofs (const FunctionMap &boundary_indicat ExcInvalidBoundaryIndicator()); return boundary_indicators.size()*selected_fe->dofs_per_vertex; -}; +} @@ -1184,7 +1184,7 @@ unsigned int DoFHandler<1>::n_boundary_dofs (const std::set &boun ExcInvalidBoundaryIndicator()); return boundary_indicators.size()*selected_fe->dofs_per_vertex; -}; +} #endif @@ -1219,7 +1219,7 @@ unsigned int DoFHandler::n_boundary_dofs () const boundary_dofs.insert(dofs_on_face[i]); }; return boundary_dofs.size(); -}; +} @@ -1246,7 +1246,7 @@ DoFHandler::n_boundary_dofs (const FunctionMap &boundary_indicators) const boundary_dofs.insert(dofs_on_face[i]); }; return boundary_dofs.size(); -}; +} @@ -1275,7 +1275,7 @@ DoFHandler::n_boundary_dofs (const std::set &boundary_indica boundary_dofs.insert(dofs_on_face[i]); }; return boundary_dofs.size(); -}; +} @@ -1283,7 +1283,7 @@ template const Triangulation & DoFHandler::get_tria () const { return *tria; -}; +} @@ -1301,7 +1301,7 @@ DoFHandler::memory_consumption () const mem += MemoryConsumption::memory_consumption (*levels[i]); return mem; -}; +} @@ -1338,7 +1338,7 @@ void DoFHandler::distribute_dofs (const FiniteElement &ff, // finally restore the user flags const_cast &>(*tria).load_user_flags(user_flags); -}; +} template @@ -1348,7 +1348,7 @@ void DoFHandler::clear () { // release memory clear_space (); -}; +} #if deal_II_dimension == 1 @@ -1400,7 +1400,7 @@ unsigned int DoFHandler<1>::distribute_dofs_on_cell (active_cell_iterator &cell, cell->set_user_flag (); return next_free_dof; -}; +} #endif @@ -1446,7 +1446,7 @@ unsigned int DoFHandler<2>::distribute_dofs_on_cell (active_cell_iterator &cell, cell->set_user_flag (); return next_free_dof; -}; +} #endif @@ -1507,7 +1507,7 @@ unsigned int DoFHandler<3>::distribute_dofs_on_cell (active_cell_iterator &cell, cell->set_user_flag (); return next_free_dof; -}; +} #endif @@ -1555,7 +1555,7 @@ void DoFHandler<1>::renumber_dofs (const std::vector &new_numbers) i!=levels[level]->line_dofs.end(); ++i) if (*i != invalid_dof_index) *i = new_numbers[*i]; -}; +} #endif @@ -1609,7 +1609,7 @@ void DoFHandler<2>::renumber_dofs (const std::vector &new_numbers) if (*i != invalid_dof_index) *i = new_numbers[*i]; }; -}; +} #endif @@ -1667,7 +1667,7 @@ void DoFHandler<3>::renumber_dofs (const std::vector &new_numbers) if (*i != invalid_dof_index) *i = new_numbers[*i]; }; -}; +} #endif @@ -1680,7 +1680,7 @@ unsigned int DoFHandler<1>::max_couplings_between_dofs () const Assert (selected_fe != 0, ExcNoFESelected()); return std::min(3*selected_fe->dofs_per_vertex + 2*selected_fe->dofs_per_line, n_dofs()); -}; +} @@ -1689,7 +1689,7 @@ unsigned int DoFHandler<1>::max_couplings_between_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); return selected_fe->dofs_per_vertex; -}; +} #endif @@ -1755,7 +1755,7 @@ unsigned int DoFHandler<2>::max_couplings_between_dofs () const max_couplings=0; }; return std::min(max_couplings,n_dofs()); -}; +} @@ -1764,7 +1764,7 @@ unsigned int DoFHandler<2>::max_couplings_between_boundary_dofs () const { Assert (selected_fe != 0, ExcNoFESelected()); return 3*selected_fe->dofs_per_vertex + 2*selected_fe->dofs_per_line; -}; +} #endif @@ -1801,7 +1801,7 @@ unsigned int DoFHandler<3>::max_couplings_between_dofs () const } return std::min(max_couplings,n_dofs()); -}; +} template <> @@ -1823,7 +1823,7 @@ unsigned int DoFHandler<3>::max_couplings_between_boundary_dofs () const { return (19*selected_fe->dofs_per_vertex + 28*selected_fe->dofs_per_line + 8*selected_fe->dofs_per_quad); -}; +} #endif @@ -1854,7 +1854,7 @@ void DoFHandler<1>::reserve_space () { selected_fe->dofs_per_line, invalid_dof_index); }; -}; +} #endif @@ -1887,7 +1887,7 @@ void DoFHandler<2>::reserve_space () { selected_fe->dofs_per_quad, invalid_dof_index); }; -}; +} #endif @@ -1922,7 +1922,7 @@ void DoFHandler<3>::reserve_space () { selected_fe->dofs_per_hex, invalid_dof_index); }; -}; +} #endif @@ -1935,7 +1935,7 @@ void DoFHandler::clear_space () { std::vector tmp; std::swap (vertex_dofs, tmp); -}; +} /*-------------- Explicit Instantiations -------------------------------*/ diff --git a/deal.II/deal.II/source/dofs/dof_levels.cc b/deal.II/deal.II/source/dofs/dof_levels.cc index dd863d99ef..24075c861e 100644 --- a/deal.II/deal.II/source/dofs/dof_levels.cc +++ b/deal.II/deal.II/source/dofs/dof_levels.cc @@ -20,7 +20,7 @@ unsigned int DoFLevel<1>::memory_consumption () const { return MemoryConsumption::memory_consumption (line_dofs); -}; +} @@ -29,7 +29,7 @@ DoFLevel<2>::memory_consumption () const { return (DoFLevel<1>::memory_consumption () + MemoryConsumption::memory_consumption (quad_dofs)); -}; +} @@ -38,4 +38,4 @@ DoFLevel<3>::memory_consumption () const { return (DoFLevel<2>::memory_consumption () + MemoryConsumption::memory_consumption (hex_dofs)); -}; +} diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 33b179ac3f..64c0b6894d 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -263,7 +263,7 @@ void DoFRenumbering::Cuthill_McKee (DoFHandler &dof_handler // this is dimension specific and // thus needs an own function dof_handler.renumber_dofs (new_number); -}; +} #ifdef ENABLE_MULTIGRID @@ -430,7 +430,7 @@ void DoFRenumbering::Cuthill_McKee (MGDoFHandler &dof_handler // this is dimension specific and // thus needs an own function dof_handler.renumber_dofs (level, new_number); -}; +} #endif @@ -582,7 +582,7 @@ DoFRenumbering::component_wise (DoFHandler &dof_handler, ExcInternalError()); dof_handler.renumber_dofs (new_indices); -}; +} @@ -733,7 +733,7 @@ void DoFRenumbering::component_wise (MGDoFHandler& dof_handler, ExcInternalError()); dof_handler.renumber_dofs (level, new_indices); -}; +} @@ -771,7 +771,7 @@ DoFRenumbering::sort_selected_dofs_back (DoFHandler &dof_handler, // now perform the renumbering dof_handler.renumber_dofs (new_dof_indices); -}; +} template @@ -965,7 +965,7 @@ DoFRenumbering::random (DoFHandler &dof_handler) std::random_shuffle (new_indices.begin(), new_indices.end()); dof_handler.renumber_dofs(new_indices); -}; +} diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 5218840a62..c1acf62583 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -163,7 +163,7 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1> &dof_h sparsity.add (boundary_dof_boundary_indices[i], boundary_dof_boundary_indices[j]); }; -}; +} @@ -181,7 +181,7 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1> &dof_handler, boundary_indicators[1] = 0; make_boundary_sparsity_pattern (dof_handler, boundary_indicators, dof_to_boundary_mapping, sparsity); -}; +} #endif @@ -240,7 +240,7 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, sparsity.add (dof_to_boundary_mapping[dofs_on_this_face[i]], dof_to_boundary_mapping[dofs_on_this_face[j]]); }; -}; +} @@ -254,7 +254,7 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, Assert (dof_to_boundary_mapping.size() == n_dofs, ExcInternalError()); Assert (boundary_indicators.find(255) == boundary_indicators.end(), - DoFHandler::ExcInvalidBoundaryIndicator()); + typename DoFHandler::ExcInvalidBoundaryIndicator()); Assert (sparsity.n_rows() == dof.n_boundary_dofs(boundary_indicators), ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs(boundary_indicators))); Assert (sparsity.n_cols() == dof.n_boundary_dofs(boundary_indicators), @@ -289,7 +289,7 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, sparsity.add (dof_to_boundary_mapping[dofs_on_this_face[i]], dof_to_boundary_mapping[dofs_on_this_face[j]]); }; -}; +} @@ -443,7 +443,7 @@ DoFTools::make_flux_sparsity_pattern (const DoFHandler<1> &dof, sparsity.add (local_dof_indices[i], neighbor_dof_indices[j]); }; }; -}; +} #endif @@ -734,7 +734,7 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<1> &, ConstraintMatrix &) { // nothing to be done here -}; +} #endif @@ -821,7 +821,7 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<2> &dof_handler, fe.constraints()(row,i)); }; }; -}; +} #endif @@ -962,7 +962,7 @@ void DoFTools::make_hanging_node_constraints (const DoFHandler<3> &dof_handler, fe.constraints()(row,i)); }; }; -}; +} #endif @@ -1036,7 +1036,7 @@ void DoFTools::distribute_cell_to_dof_vector (const DoFHandler &dof_handler if (touch_count[i] != 0) dof_data(i) /= touch_count[i]; }; -}; +} template @@ -1301,7 +1301,7 @@ DoFTools::extract_boundary_dofs (const DoFHandler &dof_handler, == true)) selected_dofs[face_dof_indices[i]] = true; }; -}; +} #else @@ -1366,7 +1366,7 @@ DoFTools::extract_boundary_dofs (const DoFHandler<1> &dof_handler, face_system_to_component_index(i).first] == true)) selected_dofs[cell->vertex_dof_index(1,i)] = true; }; -}; +} #endif @@ -1385,7 +1385,7 @@ DoFTools::extract_hanging_node_dofs (const DoFHandler<1> &dof_handler, std::fill_n (selected_dofs.begin(), dof_handler.n_dofs(), false); // there are no hanging nodes in 1d -}; +} #endif @@ -1423,7 +1423,7 @@ DoFTools::extract_hanging_node_dofs (const DoFHandler<2> &dof_handler, for (unsigned int dof=0; dof!=fe.dofs_per_line; ++dof) selected_dofs[line->child(child)->dof_index(dof)] = true; }; -}; +} #endif @@ -1490,7 +1490,7 @@ DoFTools::extract_hanging_node_dofs (const DoFHandler<3> &dof_handler, for (unsigned int dof=0; dof!=fe.dofs_per_quad; ++dof) selected_dofs[face->child(child)->dof_index(dof)] = true; }; -}; +} #endif @@ -1524,7 +1524,7 @@ DoFTools::extract_subdomain_dofs (const DoFHandler &dof_handler, for (unsigned int i=0; i &dof_handler, == dof_handler.n_dofs()), ExcInternalError()); -}; +} @@ -1806,7 +1806,7 @@ DoFTools::compute_intergrid_constraints (const DoFHandler &coa constraints.add_entries (global_dof, constraint_line); }; -}; +} @@ -1916,7 +1916,7 @@ compute_intergrid_transfer_representation (const DoFHandler &c transfer_representation[p][i] = j->second; }; }; -}; +} @@ -2151,7 +2151,7 @@ DoFTools::compute_intergrid_weights_1 (const DoFHandler &coars return n_parameters_on_fine_grid; -}; +} @@ -2194,7 +2194,7 @@ DoFTools::compute_intergrid_weights_2 (const DoFHandler &coars // wait for the threads to finish thread_manager.wait (); -}; +} @@ -2380,7 +2380,7 @@ DoFTools::compute_intergrid_weights_3 (const DoFHandler &coars mutex.release (); }; }; -}; +} @@ -2424,7 +2424,7 @@ void DoFTools::map_dof_to_boundary_indices (const DoFHandler<1> &dof_handler, for (unsigned int i=0; ivertex_dof_index(direction,i)] = next_free_index++; }; -}; +} @@ -2441,7 +2441,7 @@ void DoFTools::map_dof_to_boundary_indices (const DoFHandler<1> &dof_handler, boundary_indicators.insert (0U); boundary_indicators.insert (1U); map_dof_to_boundary_indices (dof_handler, boundary_indicators, mapping); -}; +} #else @@ -2486,7 +2486,7 @@ void DoFTools::map_dof_to_boundary_indices (const DoFHandler &dof_handl Assert (next_boundary_index == dof_handler.n_boundary_dofs(), ExcInternalError()); -}; +} @@ -2525,7 +2525,7 @@ void DoFTools::map_dof_to_boundary_indices (const DoFHandler &dof_h Assert (next_boundary_index == dof_handler.n_boundary_dofs(boundary_indicators), ExcInternalError()); -}; +} #endif @@ -2575,7 +2575,7 @@ DoFTools::map_dofs_to_support_points (const Mapping &mapping, for (unsigned int i=0; i &fe_data, face_system_to_component_table[j] = std::pair(0,j); face_system_to_base_table[j] = std::make_pair(std::make_pair(0U,0U),j); } -}; +} template @@ -248,7 +248,7 @@ FiniteElementBase::restrict (const unsigned int child) const ExcIndexRange(child, 0, GeometryInfo::children_per_cell)); Assert (restriction[child].n() != 0, ExcProjectionVoid()); return restriction[child]; -}; +} @@ -260,7 +260,7 @@ FiniteElementBase::prolongate (const unsigned int child) const ExcIndexRange(child, 0, GeometryInfo::children_per_cell)); Assert (prolongation[child].n() != 0, ExcEmbeddingVoid()); return prolongation[child]; -}; +} @@ -277,7 +277,7 @@ FiniteElementBase::constraints () const interface_constraints.n())); return interface_constraints; -}; +} @@ -303,7 +303,7 @@ FiniteElementBase::interface_constraints_size () const }; return TableIndices<2> (static_cast(-1), static_cast(-1)); -}; +} @@ -314,7 +314,7 @@ bool FiniteElementBase::operator == (const FiniteElementBase &f) const return ((static_cast&>(*this) == static_cast&>(f)) && (interface_constraints == f.interface_constraints)); -}; +} @@ -330,7 +330,7 @@ FiniteElementBase::get_unit_support_points () const (unit_support_points.size() == this->dofs_per_cell), ExcInternalError()); return unit_support_points; -}; +} @@ -339,7 +339,7 @@ bool FiniteElementBase::has_support_points () const { return (unit_support_points.size() != 0); -}; +} @@ -352,7 +352,7 @@ FiniteElementBase::unit_support_point (const unsigned index) const Assert (unit_support_points.size() == this->dofs_per_cell, ExcFEHasNoSupportPoints ()); return unit_support_points[index]; -}; +} @@ -368,7 +368,7 @@ FiniteElementBase::get_unit_face_support_points () const (unit_face_support_points.size() == this->dofs_per_face), ExcInternalError()); return unit_face_support_points; -}; +} @@ -377,7 +377,7 @@ bool FiniteElementBase::has_face_support_points () const { return (unit_face_support_points.size() != 0); -}; +} @@ -390,7 +390,7 @@ FiniteElementBase::unit_face_support_point (const unsigned index) const Assert (unit_face_support_points.size() == this->dofs_per_face, ExcFEHasNoSupportPoints ()); return unit_face_support_points[index]; -}; +} @@ -414,7 +414,7 @@ FiniteElementBase::memory_consumption () const MemoryConsumption::memory_consumption (restriction_is_additive_flags) + MemoryConsumption::memory_consumption (nonzero_components) + MemoryConsumption::memory_consumption (n_nonzero_components_table)); -}; +} @@ -552,7 +552,7 @@ compute_n_nonzero_components (const std::vector > &nonzero_com nonzero_components[i].end(), true); return retval; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_data.cc b/deal.II/deal.II/source/fe/fe_data.cc index 3c6151ee76..d8e065e7c9 100644 --- a/deal.II/deal.II/source/fe/fe_data.cc +++ b/deal.II/deal.II/source/fe/fe_data.cc @@ -48,7 +48,7 @@ FiniteElementData::FiniteElementData (const std::vector &dofs components(n_components) { Assert(dofs_per_object.size()==dim+1, ExcDimensionMismatch(dofs_per_object.size()-1,dim)); -}; +} @@ -60,7 +60,7 @@ bool FiniteElementData::operator== (const FiniteElementData &f) const (dofs_per_quad == f.dofs_per_quad) && (dofs_per_hex == f.dofs_per_hex) && (components == f.components)); -}; +} template class FiniteElementData<1>; diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc index aec8650d6c..29f7936c15 100644 --- a/deal.II/deal.II/source/fe/fe_dgp.cc +++ b/deal.II/deal.II/source/fe/fe_dgp.cc @@ -69,7 +69,7 @@ FE_DGP::FE_DGP (const unsigned int degree) // elements have neither support // nor face-support points, so // leave these fields empty -}; +} @@ -424,7 +424,7 @@ unsigned int FE_DGP::n_base_elements () const { return 1; -}; +} @@ -434,7 +434,7 @@ FE_DGP::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -444,7 +444,7 @@ FE_DGP::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -473,7 +473,7 @@ unsigned int FE_DGP::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_dgp_1d.cc b/deal.II/deal.II/source/fe/fe_dgp_1d.cc index 1a9b149e42..65aaee5102 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_1d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_1d.cc @@ -134,7 +134,7 @@ namespace FE_DGP_1d 0, 0, 0, 0, 0, 1./32., 5.044891251/27., 0, 0, 0, 0, 0., 0., 1./64., }; -}; +} template <> @@ -172,5 +172,5 @@ const unsigned int FE_DGP<1>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension diff --git a/deal.II/deal.II/source/fe/fe_dgp_2d.cc b/deal.II/deal.II/source/fe/fe_dgp_2d.cc index ce457e86c1..1c1cc46f00 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_2d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_2d.cc @@ -470,7 +470,7 @@ namespace FE_DGP_2d 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1./64., 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0., 0., 0, 0., 0., 1./64., }; -}; +} template <> @@ -529,5 +529,5 @@ const unsigned int FE_DGP<2>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/fe/fe_dgp_3d.cc b/deal.II/deal.II/source/fe/fe_dgp_3d.cc index 80535d21d0..c15f1a22cd 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_3d.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_3d.cc @@ -742,7 +742,7 @@ namespace FE_DGP_3d 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1./16., 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1./16., }; -}; +} template <> @@ -814,5 +814,5 @@ const unsigned int FE_DGP<3>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension diff --git a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc index debf89db40..480b8f777d 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc @@ -72,7 +72,7 @@ FE_DGPNonparametric::FE_DGPNonparametric (const unsigned int degree) // elements have neither support // nor face-support points, so // leave these fields empty -}; +} @@ -378,7 +378,7 @@ unsigned int FE_DGPNonparametric::n_base_elements () const { return 1; -}; +} @@ -388,7 +388,7 @@ FE_DGPNonparametric::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -398,7 +398,7 @@ FE_DGPNonparametric::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -427,7 +427,7 @@ unsigned int FE_DGPNonparametric::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 485604393d..38b01d2d23 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -205,7 +205,7 @@ FE_DGQ::FE_DGQ (const unsigned int degree) // note: no face support points for // DG elements -}; +} @@ -639,7 +639,7 @@ unsigned int FE_DGQ::n_base_elements () const { return 1; -}; +} @@ -649,7 +649,7 @@ FE_DGQ::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -659,7 +659,7 @@ FE_DGQ::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -751,7 +751,7 @@ unsigned int FE_DGQ::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_dgq_1d.cc b/deal.II/deal.II/source/fe/fe_dgq_1d.cc index e457b9e9ac..37ecf94bc2 100644 --- a/deal.II/deal.II/source/fe/fe_dgq_1d.cc +++ b/deal.II/deal.II/source/fe/fe_dgq_1d.cc @@ -126,7 +126,7 @@ namespace FE_DGQ_1d -0.012439378, 0.040990099, -0.017439155, -0.050376157, 0.0042995099, 0.054999345, 0.038394855, -0.001831157, -0.050934606, 0.18647931, -0.15057292, -0.1043873, -0.016304977, 0.28934245, 0.015028935, -0.031932147, }; -}; +} @@ -174,5 +174,5 @@ const unsigned int FE_DGQ<1>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 1 diff --git a/deal.II/deal.II/source/fe/fe_dgq_2d.cc b/deal.II/deal.II/source/fe/fe_dgq_2d.cc index 8d7c7b119b..dae73d1c54 100644 --- a/deal.II/deal.II/source/fe/fe_dgq_2d.cc +++ b/deal.II/deal.II/source/fe/fe_dgq_2d.cc @@ -427,7 +427,7 @@ namespace FE_DGQ_2d 0.00063359485, -0.0020878146, 0.00088825647, 0.0025658897, -0.00021899385, -0.00280137, -0.0019556268, 9.3269261e-05, -0.0023196867, 0.0076438055, -0.0032520415, -0.0093941111, 0.00080176965, 0.01025624, 0.0071598461, -0.00034147289, 0.0018730335, -0.0061719988, 0.0026258644, 0.0075852849, -0.00064738975, -0.0082814118, -0.0057812253, 0.00027572265, 0.0012985131, -0.0042788457, 0.0018204262, 0.0052586309, -0.00044881422, -0.005741233, -0.0040079352, 0.00019114953, 0.00020282378, -0.00066834262, 0.00028434501, 0.00082138208, -7.010341e-05, -0.00089676305, -0.00062602722, 2.9856972e-05, -0.0035992402, 0.011860176, -0.0050458877, -0.014575961, 0.0012440307, 0.015913645, 0.011109261, -0.00052983145, -0.00018695061, 0.00061603754, -0.00026209192, -0.0007571, 6.4617056e-05, 0.00082658159, 0.00057703379, -2.752034e-05, 0.00039721606, -0.0013089019, 0.00055686965, 0.0016086189, -0.00013729258, -0.0017562472, -0.0012260302, 5.8472774e-05, 0.0025943341, -0.0094982503, 0.0076693723, 0.0053169259, 0.00083048758, -0.014737544, -0.0007654929, 0.0016264513, -0.0094982503, 0.034774534, -0.028078734, -0.019466071, -0.0030405409, 0.05395638, 0.0028025855, -0.0059546848, 0.0076693723, -0.028078734, 0.022672203, 0.0157179, 0.0024550879, -0.043567136, -0.0022629506, 0.0048081165, 0.0053169259, -0.019466071, 0.0157179, 0.010896708, 0.0017020325, -0.030203676, -0.0015688299, 0.0033333105, 0.00083048758, -0.0030405409, 0.0024550879, 0.0017020325, 0.00026585227, -0.0047177219, -0.00024504644, 0.00052065292, -0.014737544, 0.05395638, -0.043567136, -0.030203676, -0.0047177219, 0.083719052, 0.0043485089, -0.0092393256, -0.0007654929, 0.0028025855, -0.0022629506, -0.0015688299, -0.00024504644, 0.0043485089, 0.00022586889, -0.00047990617, 0.0016264513, -0.0059546848, 0.0048081165, 0.0033333105, 0.00052065292, -0.0092393256, -0.00047990617, 0.001019662, }; -}; +} template <> @@ -471,5 +471,5 @@ const unsigned int FE_DGQ<2>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/fe/fe_dgq_3d.cc b/deal.II/deal.II/source/fe/fe_dgq_3d.cc index 8a9bbfa201..cf54f2bca3 100644 --- a/deal.II/deal.II/source/fe/fe_dgq_3d.cc +++ b/deal.II/deal.II/source/fe/fe_dgq_3d.cc @@ -385,7 +385,7 @@ static const double dgq4_refined_onto_dgq4[] = -5.6211513e-05, 0.00027635624, -0.00023302227, -0.00049874943, 1.1242303e-05, 8.9938421e-05, -0.00044216998, 0.00037283564, 0.00079799909, -1.7987684e-05, 0.00013490763, -0.00066325498, 0.00055925346, 0.0011969986, -2.6981526e-05, -0.0002338399, 0.001149642, -0.00096937266, -0.0020747976, 4.6767979e-05, -5.6211513e-05, 0.00027635624, -0.00023302227, -0.00049874943, 1.1242303e-05, 8.9938421e-05, -0.00044216998, 0.00037283564, 0.00079799909, -1.7987684e-05, -0.00014390147, 0.00070747198, -0.00059653702, -0.0012767985, 2.8780295e-05, -0.00021585221, 0.001061208, -0.00089480553, -0.0019151978, 4.3170442e-05, 0.00037414383, -0.0018394271, 0.0015509963, 0.0033196762, -7.4828767e-05, 8.9938421e-05, -0.00044216998, 0.00037283564, 0.00079799909, -1.7987684e-05, 0.00013490763, -0.00066325498, 0.00055925346, 0.0011969986, -2.6981526e-05, -0.00021585221, 0.001061208, -0.00089480553, -0.0019151978, 4.3170442e-05, -0.00032377832, 0.0015918119, -0.0013422083, -0.0028727967, 6.4755663e-05, 0.00056121575, -0.0027591407, 0.0023264944, 0.0049795143, -0.00011224315, 0.00013490763, -0.00066325498, 0.00055925346, 0.0011969986, -2.6981526e-05, -0.0002338399, 0.001149642, -0.00096937266, -0.0020747976, 4.6767979e-05, 0.00037414383, -0.0018394271, 0.0015509963, 0.0033196762, -7.4828767e-05, 0.00056121575, -0.0027591407, 0.0023264944, 0.0049795143, -0.00011224315, -0.00097277397, 0.0047825106, -0.0040325903, -0.0086311581, 0.00019455479, -0.0002338399, 0.001149642, -0.00096937266, -0.0020747976, 4.6767979e-05, -5.6211513e-05, 0.00027635624, -0.00023302227, -0.00049874943, 1.1242303e-05, 8.9938421e-05, -0.00044216998, 0.00037283564, 0.00079799909, -1.7987684e-05, 0.00013490763, -0.00066325498, 0.00055925346, 0.0011969986, -2.6981526e-05, -0.0002338399, 0.001149642, -0.00096937266, -0.0020747976, 4.6767979e-05, -5.6211513e-05, 0.00027635624, -0.00023302227, -0.00049874943, 1.1242303e-05, 0.00065409761, -0.0010465562, -0.0015698343, 0.0027210461, 0.00065409761, -0.0010465562, 0.0016744899, 0.0025117348, -0.0043536737, -0.0010465562, -0.0015698343, 0.0025117348, 0.0037676022, -0.0065305105, -0.0015698343, 0.0027210461, -0.0043536737, -0.0065305105, 0.011319552, 0.0027210461, 0.00065409761, -0.0010465562, -0.0015698343, 0.0027210461, 0.00065409761, -0.0010465562, 0.0016744899, 0.0025117348, -0.0043536737, -0.0010465562, 0.0016744899, -0.0026791838, -0.0040187757, 0.0069658779, 0.0016744899, 0.0025117348, -0.0040187757, -0.0060281636, 0.010448817, 0.0025117348, -0.0043536737, 0.0069658779, 0.010448817, -0.018111283, -0.0043536737, -0.0010465562, 0.0016744899, 0.0025117348, -0.0043536737, -0.0010465562, -0.0015698343, 0.0025117348, 0.0037676022, -0.0065305105, -0.0015698343, 0.0025117348, -0.0040187757, -0.0060281636, 0.010448817, 0.0025117348, 0.0037676022, -0.0060281636, -0.0090422454, 0.015673225, 0.0037676022, -0.0065305105, 0.010448817, 0.015673225, -0.027166924, -0.0065305105, -0.0015698343, 0.0025117348, 0.0037676022, -0.0065305105, -0.0015698343, 0.0027210461, -0.0043536737, -0.0065305105, 0.011319552, 0.0027210461, -0.0043536737, 0.0069658779, 0.010448817, -0.018111283, -0.0043536737, -0.0065305105, 0.010448817, 0.015673225, -0.027166924, -0.0065305105, 0.011319552, -0.018111283, -0.027166924, 0.047089335, 0.011319552, 0.0027210461, -0.0043536737, -0.0065305105, 0.011319552, 0.0027210461, 0.00065409761, -0.0010465562, -0.0015698343, 0.0027210461, 0.00065409761, -0.0010465562, 0.0016744899, 0.0025117348, -0.0043536737, -0.0010465562, -0.0015698343, 0.0025117348, 0.0037676022, -0.0065305105, -0.0015698343, 0.0027210461, -0.0043536737, -0.0065305105, 0.011319552, 0.0027210461, 0.00065409761, -0.0010465562, -0.0015698343, 0.0027210461, 0.00065409761, }; -}; +} template <> @@ -427,5 +427,5 @@ const unsigned int FE_DGQ<3>::Matrices::n_projection_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 3 diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index 14e7257f2c..b36881c98c 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -260,7 +260,7 @@ FE_Nedelec::FE_Nedelec (const unsigned int degree) std::vector > tmp1, tmp2; this->system_to_component_table.swap (tmp1); this->face_system_to_component_table.swap (tmp2); -}; +} @@ -643,7 +643,7 @@ void FE_Nedelec::initialize_unit_support_points () // right now Assert (false, ExcNotImplemented()); }; -}; +} #if deal_II_dimension == 1 @@ -652,7 +652,7 @@ template <> void FE_Nedelec<1>::initialize_unit_face_support_points () { // no faces in 1d, so nothing to do -}; +} #endif @@ -691,7 +691,7 @@ void FE_Nedelec::initialize_unit_face_support_points () // right now Assert (false, ExcNotImplemented()); }; -}; +} @@ -938,7 +938,7 @@ FE_Nedelec::fill_fe_values (const Mapping &mapping, if (flags & update_second_derivatives) this->compute_2nd (mapping, cell, 0, mapping_data, fe_data, data); -}; +} @@ -1222,7 +1222,7 @@ FE_Nedelec::fill_fe_subface_values (const Mapping &m if (flags & update_second_derivatives) this->compute_2nd (mapping, cell, offset, mapping_data, fe_data, data); -}; +} @@ -1231,7 +1231,7 @@ unsigned int FE_Nedelec::n_base_elements () const { return 1; -}; +} @@ -1241,7 +1241,7 @@ FE_Nedelec::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -1251,7 +1251,7 @@ FE_Nedelec::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -1332,7 +1332,7 @@ unsigned int FE_Nedelec::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_nedelec_1d.cc b/deal.II/deal.II/source/fe/fe_nedelec_1d.cc index 1babaddbd8..983c3e4954 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_1d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_1d.cc @@ -48,6 +48,6 @@ FE_Nedelec<1>::Matrices::constraint_matrices[] = {}; #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 1 diff --git a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc index d55ffd5905..1a4e9b7715 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_2d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_2d.cc @@ -64,7 +64,7 @@ namespace FE_Nedelec_2d 0., 0., .5, 0., 0., 0., 0., .5, }; -}; // namespace FE_Nedelec_2d +} // namespace FE_Nedelec_2d // embedding matrices @@ -111,7 +111,7 @@ namespace FE_Nedelec_2d 1./2., 1./2. }; -}; +} template <> @@ -133,5 +133,5 @@ sizeof(FE_Nedelec<2>::Matrices::constraint_matrices[0]); #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/fe/fe_nedelec_3d.cc b/deal.II/deal.II/source/fe/fe_nedelec_3d.cc index 6afa6fbe65..0ca2a616b9 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec_3d.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec_3d.cc @@ -165,7 +165,7 @@ namespace FE_Nedelec_3d 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.5, }; -}; // namespace FE_Nedelec_3d +} // namespace FE_Nedelec_3d // embedding matrices @@ -214,7 +214,7 @@ namespace FE_Nedelec_3d 0, 0, 0, .5, 0, 0, 0, .5 }; -}; +} @@ -238,5 +238,5 @@ sizeof(FE_Nedelec<3>::Matrices::constraint_matrices[0]); #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 3 diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 8a057dc7a9..97817298fe 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -627,7 +627,7 @@ FE_Q::FE_Q (const unsigned int degree) // on cell and face initialize_unit_support_points (); initialize_unit_face_support_points (); -}; +} @@ -742,7 +742,7 @@ void FE_Q::initialize_unit_support_points () this->unit_support_points[renumber[k++]] = p; }; -}; +} #if deal_II_dimension == 1 @@ -751,7 +751,7 @@ template <> void FE_Q<1>::initialize_unit_face_support_points () { // no faces in 1d, so nothing to do -}; +} #endif @@ -784,7 +784,7 @@ void FE_Q::initialize_unit_face_support_points () this->unit_face_support_points[face_renumber[k++]] = p; }; -}; +} @@ -1304,7 +1304,7 @@ unsigned int FE_Q::n_base_elements () const { return 1; -}; +} @@ -1314,7 +1314,7 @@ FE_Q::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -1324,7 +1324,7 @@ FE_Q::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -1468,7 +1468,7 @@ FE_Q::has_support_on_face (const unsigned int shape_index, // we should not have gotten here Assert (false, ExcInternalError()); return false; -}; +} @@ -1487,7 +1487,7 @@ unsigned int FE_Q::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_q_1d.cc b/deal.II/deal.II/source/fe/fe_q_1d.cc index a5275ad93b..5fe450b307 100644 --- a/deal.II/deal.II/source/fe/fe_q_1d.cc +++ b/deal.II/deal.II/source/fe/fe_q_1d.cc @@ -83,7 +83,7 @@ namespace FE_Q_1d -1.0546875/27., 7.3828125/27., 5.90625/27., -14.765625/27., 29.53125/27., }; -}; // namespace FE_Q_1d +} // namespace FE_Q_1d @@ -124,5 +124,5 @@ FE_Q<1>::Matrices::constraint_matrices[] = { 0 }; #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 1 diff --git a/deal.II/deal.II/source/fe/fe_q_2d.cc b/deal.II/deal.II/source/fe/fe_q_2d.cc index 1cf85b7aba..bf7f4f2c1e 100644 --- a/deal.II/deal.II/source/fe/fe_q_2d.cc +++ b/deal.II/deal.II/source/fe/fe_q_2d.cc @@ -185,7 +185,7 @@ namespace FE_Q_2d 0., 0., 0., 0., 1.6875/27., 0., 0., 0., 8.4375/27., 0., 0., 0., -8.4375/27., 0., 25.3125/27., 0., }; -}; // namespace FE_Q_2d +} // namespace FE_Q_2d // embedding matrices @@ -244,7 +244,7 @@ namespace FE_Q_2d 0., 0., 0., 0., 1., -0.0390625, 0.2734375, 0.21875, -0.546875, 1.09375 }; -}; +} template <> @@ -269,5 +269,5 @@ FE_Q<2>::Matrices::n_constraint_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/fe/fe_q_3d.cc b/deal.II/deal.II/source/fe/fe_q_3d.cc index 2e78beb61e..b21e833a50 100644 --- a/deal.II/deal.II/source/fe/fe_q_3d.cc +++ b/deal.II/deal.II/source/fe/fe_q_3d.cc @@ -364,7 +364,7 @@ namespace FE_Q_3d 0.421875/27., 0., 0., -1.265625/27., -1.265625/27., 0., 0., 3.796875/27., 0., 0., 0., -2.53125/27., 0., 0., 0., 7.59375/27., -2.53125/27., 0., 0., 7.59375/27., 0., 0., 0., 0., 0., 15.1875/27., 0., 0.158203125/27., -0.052734375/27., 0.158203125/27., -0.474609375/27., -0.474609375/27., 0.158203125/27., -0.474609375/27., 1.423828125/27., 0.31640625/27., 0.31640625/27., -0.94921875/27., -0.94921875/27., -0.94921875/27., -0.94921875/27., 2.84765625/27., 2.84765625/27., -0.94921875/27., 0.31640625/27., -0.94921875/27., 2.84765625/27., -1.8984375/27., 5.6953125/27., -1.8984375/27., -1.8984375/27., 5.6953125/27., 5.6953125/27., 11.390625/27., }; -}; // namespace FE_Q_3d +} // namespace FE_Q_3d // embedding matrices @@ -429,7 +429,7 @@ namespace FE_Q_3d .015625,-.046875,.140625,-.046875,-.09375,.28125,.28125,-.09375,.5625, -.046875,.015625,-.046875,.140625,-.09375,-.09375,.28125,.28125,.5625 }; -}; +} @@ -454,5 +454,5 @@ FE_Q<3>::Matrices::n_constraint_matrices #else // #if deal_II_dimension // On gcc2.95 on Alpha OSF1, the native assembler does not like empty // files, so provide some dummy code -namespace { void dummy () {}; }; +namespace { void dummy () {} } #endif // #if deal_II_dimension == 3 diff --git a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc index 7b2457adcc..448ec5eb87 100644 --- a/deal.II/deal.II/source/fe/fe_q_hierarchical.cc +++ b/deal.II/deal.II/source/fe/fe_q_hierarchical.cc @@ -315,7 +315,7 @@ FE_Q_Hierarchical::FE_Q_Hierarchical (const unsigned int degree) // on cell and face initialize_unit_support_points (); initialize_unit_face_support_points (); -}; +} @@ -452,7 +452,7 @@ void FE_Q_Hierarchical::initialize_unit_support_points () } this->unit_support_points[renumber[k++]] = p; }; -}; +} #if deal_II_dimension == 1 @@ -461,7 +461,7 @@ template <> void FE_Q_Hierarchical<1>::initialize_unit_face_support_points () { // no faces in 1d, so nothing to do -}; +} #endif @@ -511,7 +511,7 @@ void FE_Q_Hierarchical::initialize_unit_face_support_points () } this->unit_face_support_points[face_renumber[k++]] = p; }; -}; +} // we use same dpo_vector as FE_Q @@ -1044,7 +1044,7 @@ unsigned int FE_Q_Hierarchical::n_base_elements () const { return 1; -}; +} @@ -1054,7 +1054,7 @@ FE_Q_Hierarchical::base_element (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return *this; -}; +} @@ -1064,7 +1064,7 @@ FE_Q_Hierarchical::element_multiplicity (const unsigned int index) const { Assert (index==0, ExcIndexRange(index, 0, 1)); return 1; -}; +} @@ -1336,7 +1336,7 @@ unsigned int FE_Q_Hierarchical::get_degree () const { return degree; -}; +} diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 739b6769f3..d9852e0d97 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -58,7 +58,7 @@ FESystem::InternalData::~InternalData() delete base_fe_values_datas[i]; base_fe_values_datas[i] = 0; }; -}; +} @@ -70,7 +70,7 @@ InternalData::get_fe_data (const unsigned int base_no) const Assert(base_no::InternalData::clear_first_cell () // sub-objects for (unsigned int i=0; iclear_first_cell (); -}; +} /* ---------------------------------- FESystem ------------------- */ @@ -159,7 +159,7 @@ FESystem::FESystem (const FiniteElement &fe, base_elements[0] = ElementPair(fe.clone(), n_elements); base_elements[0].first->subscribe (); initialize (); -}; +} @@ -180,7 +180,7 @@ FESystem::FESystem (const FiniteElement &fe1, base_elements[1] = ElementPair(fe2.clone(), n2); base_elements[1].first->subscribe (); initialize (); -}; +} @@ -209,7 +209,7 @@ FESystem::FESystem (const FiniteElement &fe1, base_elements[2] = ElementPair(fe3.clone(), n3); base_elements[2].first->subscribe (); initialize (); -}; +} @@ -224,7 +224,7 @@ FESystem::~FESystem () delete base_elements[i].first; base_elements[i].first = 0; } -}; +} @@ -553,7 +553,7 @@ fill_fe_values (const Mapping &mapping, { compute_fill(mapping, cell, invalid_face_number, invalid_face_number, quadrature, mapping_data, fe_data, data); -}; +} @@ -570,7 +570,7 @@ fill_fe_face_values (const Mapping &mapping, { compute_fill (mapping, cell, face_no, invalid_face_number, quadrature, mapping_data, fe_data, data); -}; +} @@ -1041,7 +1041,7 @@ FESystem::build_cell_tables() this->system_to_component_table[total_index] = non_primitive_index; } } -}; +} @@ -1223,7 +1223,7 @@ FESystem::build_face_tables() ExcInternalError()); Assert (total_index == this->face_system_to_base_table.size(), ExcInternalError()); -}; +} @@ -1477,7 +1477,7 @@ void FESystem::build_interface_constraints () = (base_element(n_index.first.first).constraints()(m_index.second, n_index.second)); }; -}; +} @@ -1580,7 +1580,7 @@ void FESystem::initialize () // on cell and face initialize_unit_support_points (); initialize_unit_face_support_points (); -}; +} @@ -1596,7 +1596,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe_data, if (dim>2) dpo.push_back(fe_data.dofs_per_hex * N); return FiniteElementData (dpo, fe_data.n_components() * N); -}; +} @@ -1647,7 +1647,7 @@ FESystem<1>:: initialize_unit_face_support_points () { // no faces no work -}; +} #endif @@ -1710,7 +1710,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, return FiniteElementData (dpo, fe1.n_components() * N1 + fe2.n_components() * N2); -}; +} @@ -1741,7 +1741,7 @@ FESystem::multiply_dof_numbers (const FiniteElementData &fe1, fe1.n_components() * N1 + fe2.n_components() * N2 + fe3.n_components() * N3); -}; +} @@ -1757,7 +1757,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteElement & multiplicities.push_back (n_elements); return compute_restriction_is_additive_flags (fe_list, multiplicities); -}; +} @@ -1778,7 +1778,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteElement & multiplicities.push_back (N2); return compute_restriction_is_additive_flags (fe_list, multiplicities); -}; +} @@ -1804,7 +1804,7 @@ FESystem::compute_restriction_is_additive_flags (const FiniteElement & multiplicities.push_back (N3); return compute_restriction_is_additive_flags (fe_list, multiplicities); -}; +} @@ -1936,7 +1936,7 @@ compute_restriction_is_additive_flags (const std::vector::compute_nonzero_components (const FiniteElement &fe1, multiplicities.push_back (N1); return compute_nonzero_components (fe_list, multiplicities); -}; +} @@ -1973,7 +1973,7 @@ FESystem::compute_nonzero_components (const FiniteElement &fe1, multiplicities.push_back (N2); return compute_nonzero_components (fe_list, multiplicities); -}; +} @@ -1999,7 +1999,7 @@ FESystem::compute_nonzero_components (const FiniteElement &fe1, multiplicities.push_back (N3); return compute_nonzero_components (fe_list, multiplicities); -}; +} @@ -2181,7 +2181,7 @@ compute_nonzero_components (const std::vector*> &fes, Assert (total_index == n_shape_functions, ExcInternalError()); return retval; -}; +} @@ -2193,7 +2193,7 @@ FESystem::base_element (const unsigned int index) const Assert (index < base_elements.size(), ExcIndexRange(index, 0, base_elements.size())); return *base_elements[index].first; -}; +} @@ -2202,7 +2202,7 @@ unsigned int FESystem::n_base_elements () const { return base_elements.size(); -}; +} @@ -2213,7 +2213,7 @@ FESystem::element_multiplicity (const unsigned int index) const Assert (index < base_elements.size(), ExcIndexRange(index, 0, base_elements.size())); return base_elements[index].second; -}; +} @@ -2249,7 +2249,7 @@ FESystem::unit_support_point (const unsigned index) const // provide this information return (base_element(this->system_to_base_index(index).first.first) .unit_support_point(this->system_to_base_index(index).second)); -}; +} @@ -2273,7 +2273,7 @@ FESystem::unit_face_support_point (const unsigned index) const // provide this information return (base_element(this->face_system_to_base_index(index).first.first) .unit_face_support_point(this->face_system_to_base_index(index).second)); -}; +} @@ -2293,7 +2293,7 @@ FESystem::memory_consumption () const for (unsigned int i=0; i &fe, default: Assert (false, ExcNotImplemented()); }; -}; +} @@ -849,7 +849,7 @@ FETools::lexicographic_to_hierarchic_numbering (const FE_Q &fe, } } } -}; +} diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 3575a51e28..7de3aca4fd 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -171,7 +171,7 @@ void FEValuesBase::get_function_values (const InputVector &fe_fu for (unsigned int shape_func=0; shape_funcshape_value(shape_func, point)); -}; +} @@ -218,7 +218,7 @@ void FEValuesBase::get_function_values (const InputVector for (unsigned int c=0; c::get_quadrature_points () const { Assert (this->update_flags & update_q_points, ExcAccessToUninitializedField()); return this->quadrature_points; -}; +} @@ -282,7 +282,7 @@ get_function_grads (const InputVector &fe_function, tmp *= dof_values(shape_func); gradients[point] += tmp; }; -}; +} @@ -338,7 +338,7 @@ get_function_grads (const InputVector &fe_function, tmp *= dof_values(shape_func); gradients[point][c] += tmp; }; -}; +} @@ -381,7 +381,7 @@ get_function_2nd_derivatives (const InputVector &fe_function, tmp *= dof_values(shape_func); second_derivatives[point] += tmp; }; -}; +} @@ -433,7 +433,7 @@ get_function_2nd_derivatives (const InputVector &fe_func tmp *= dof_values(shape_func); second_derivs[point][c] += tmp; }; -}; +} @@ -445,7 +445,7 @@ FEValuesBase::quadrature_point (const unsigned int i) const Assert (iquadrature_points.size(), ExcIndexRange(i, 0, this->quadrature_points.size())); return this->quadrature_points[i]; -}; +} @@ -457,7 +457,7 @@ double FEValuesBase::JxW (const unsigned int i) const Assert (iJxW_values.size(), ExcIndexRange(i, 0, this->JxW_values.size())); return this->JxW_values[i]; -}; +} @@ -483,7 +483,7 @@ FEValuesBase::memory_consumption () const MemoryConsumption::memory_consumption (fe_data) + MemoryConsumption::memory_consumption (*fe_data) + MemoryConsumption::memory_consumption (this->shape_function_to_row_table)); -}; +} @@ -505,7 +505,7 @@ FEValuesBase::compute_update_flags (const UpdateFlags update_flags) const | mapping->update_each (flags); return flags; -}; +} @@ -536,7 +536,7 @@ FEValues::FEValues (const Mapping &mapping, quadrature (q) { initialize (update_flags); -}; +} @@ -554,7 +554,7 @@ FEValues::FEValues (const FiniteElement &fe, { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); -}; +} @@ -578,7 +578,7 @@ FEValues::initialize (const UpdateFlags update_flags) // set up objects within this class FEValuesData::initialize (this->n_quadrature_points, *this->fe, flags); -}; +} @@ -620,7 +620,7 @@ FEValues::memory_consumption () const { return (FEValuesBase::memory_consumption () + MemoryConsumption::memory_consumption (quadrature)); -}; +} /*------------------------------- FEFaceValuesBase --------------------------*/ @@ -640,7 +640,7 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, mapping, fe), quadrature(quadrature) -{}; +{} @@ -651,7 +651,7 @@ FEFaceValuesBase::get_normal_vectors () const Assert (this->update_flags & update_normal_vectors, typename FEValuesBase::ExcAccessToUninitializedField()); return this->normal_vectors; -}; +} @@ -660,9 +660,9 @@ const std::vector > & FEFaceValuesBase::get_boundary_forms () const { Assert (this->update_flags & update_boundary_forms, - FEValuesBase::ExcAccessToUninitializedField()); + typename FEValuesBase::ExcAccessToUninitializedField()); return this->boundary_forms; -}; +} @@ -673,7 +673,7 @@ FEFaceValuesBase::memory_consumption () const return (FEValuesBase::memory_consumption () + MemoryConsumption::memory_consumption (quadrature) + MemoryConsumption::memory_consumption (present_face)); -}; +} /*------------------------------- FEFaceValues -------------------------------*/ @@ -692,7 +692,7 @@ FEFaceValues::FEFaceValues (const Mapping &mapping, fe, quadrature) { initialize (update_flags); -}; +} @@ -709,7 +709,7 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); -}; +} @@ -728,7 +728,7 @@ FEFaceValues::initialize (const UpdateFlags update_flags) // set up objects within this class FEValuesData::initialize(this->n_quadrature_points, *this->fe, flags); -}; +} @@ -764,7 +764,7 @@ void FEFaceValues::reinit (const typename DoFHandler::cell_iterator &c this->fe_data->clear_first_cell (); this->mapping_data->clear_first_cell (); -}; +} /*------------------------------- FESubFaceValues -------------------------------*/ @@ -800,7 +800,7 @@ FESubfaceValues::FESubfaceValues (const FiniteElement &fe, { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); initialize (update_flags); -}; +} @@ -821,7 +821,7 @@ FESubfaceValues::initialize (const UpdateFlags update_flags) // set up objects within this class FEValuesData::initialize(this->n_quadrature_points, *this->fe, flags); -}; +} @@ -862,7 +862,7 @@ void FESubfaceValues::reinit (const typename DoFHandler::cell_iterator this->fe_data->clear_first_cell (); this->mapping_data->clear_first_cell (); -}; +} /*------------------------------- Explicit Instantiations -------------*/ diff --git a/deal.II/deal.II/source/fe/mapping_c1.cc b/deal.II/deal.II/source/fe/mapping_c1.cc index 559ba4ec35..cbad47d0f0 100644 --- a/deal.II/deal.II/source/fe/mapping_c1.cc +++ b/deal.II/deal.II/source/fe/mapping_c1.cc @@ -27,7 +27,7 @@ MappingC1::MappingC1 () MappingQ (3) { Assert (dim > 1, ExcImpossibleInDim(dim)); -}; +} #if deal_II_dimension == 1 @@ -39,7 +39,7 @@ MappingC1<1>::add_line_support_points (const Triangulation<1>::cell_iterator &, { const unsigned int dim = 1; Assert (dim > 1, ExcImpossibleInDim(dim)); -}; +} #endif @@ -183,7 +183,7 @@ MappingC1<2>::add_line_support_points (const Triangulation<2>::cell_iterator &ce a.insert (a.end(), line_points.begin(), line_points.end()); }; }; -}; +} #endif @@ -195,7 +195,7 @@ MappingC1::add_line_support_points (const typename Triangulation::cell std::vector > &) const { Assert (false, ExcNotImplemented()); -}; +} @@ -209,7 +209,7 @@ MappingC1<1>::add_quad_support_points (const Triangulation<1>::cell_iterator &, { const unsigned int dim = 1; Assert (dim > 2, ExcImpossibleInDim(dim)); -}; +} #endif @@ -224,7 +224,7 @@ MappingC1<2>::add_quad_support_points (const Triangulation<2>::cell_iterator &, { const unsigned int dim = 2; Assert (dim > 2, ExcImpossibleInDim(dim)); -}; +} #endif @@ -237,7 +237,7 @@ MappingC1::add_quad_support_points (const typename Triangulation::cell std::vector > &) const { Assert (false, ExcNotImplemented()); -}; +} diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index af9c987276..92d817a963 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -49,7 +49,7 @@ MappingCartesian::InternalData::memory_consumption () const MemoryConsumption::memory_consumption (quadrature_points) + MemoryConsumption::memory_consumption (unit_tangentials) + MemoryConsumption::memory_consumption (aux)); -}; +} diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index 1318982481..f35144e7e7 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -52,7 +52,7 @@ MappingQ::InternalData::memory_consumption () const MemoryConsumption::memory_consumption (unit_normals) + MemoryConsumption::memory_consumption (use_mapping_q1_on_current_cell) + MemoryConsumption::memory_consumption (mapping_q1_data)); -}; +} @@ -864,7 +864,7 @@ MappingQ::add_line_support_points (const typename Triangulation::cell_ a.insert (a.end(), line_points.begin(), line_points.end()); } } -}; +} @@ -1255,7 +1255,7 @@ unsigned int MappingQ::get_degree() const { return degree; -}; +} // explicit instantiation diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index eb5b90d0fe..d25cab652f 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -56,13 +56,13 @@ MappingQ1::InternalData::memory_consumption () const MemoryConsumption::memory_consumption (cell_of_current_support_points) + MemoryConsumption::memory_consumption (is_mapping_q1_data) + MemoryConsumption::memory_consumption (n_shape_functions)); -}; +} template MappingQ1::MappingQ1 () -{}; +{} diff --git a/deal.II/deal.II/source/grid/geometry_info.cc b/deal.II/deal.II/source/grid/geometry_info.cc index 812106d8d7..1a9ef5a3b6 100644 --- a/deal.II/deal.II/source/grid/geometry_info.cc +++ b/deal.II/deal.II/source/grid/geometry_info.cc @@ -93,7 +93,7 @@ GeometryInfo<2>::child_cell_on_face (const unsigned int face, {3,2}, {0,3}}; return subcells[face][subface]; -}; +} @@ -112,4 +112,4 @@ GeometryInfo<3>::child_cell_on_face (const unsigned int face, {3, 2, 6, 7}, {0, 4, 7, 3}}; return subcells[face][subface]; -}; +} diff --git a/deal.II/deal.II/source/grid/grid_generator.cc b/deal.II/deal.II/source/grid/grid_generator.cc index 204b400ef7..4ec9c7fda5 100644 --- a/deal.II/deal.II/source/grid/grid_generator.cc +++ b/deal.II/deal.II/source/grid/grid_generator.cc @@ -106,7 +106,7 @@ void GridGenerator::colorize_hyper_rectangle (Triangulation<1> &) { // nothing to do in 1d -}; +} #else @@ -137,7 +137,7 @@ GridGenerator::colorize_hyper_rectangle (Triangulation &tria) default: Assert(false, ExcNotImplemented()); }; -}; +} #endif @@ -166,7 +166,7 @@ void GridGenerator::hyper_cube_slit (Triangulation<1> &, const bool) { Assert (false, ExcNotImplemented()); -}; +} @@ -175,7 +175,7 @@ void GridGenerator::hyper_L (Triangulation<1> &, const double) { Assert (false, ExcNotImplemented()); -}; +} @@ -184,7 +184,7 @@ void GridGenerator::hyper_ball (Triangulation<1> &, const double) { Assert (false, ExcNotImplemented()); -}; +} @@ -193,7 +193,7 @@ void GridGenerator::cylinder (Triangulation<1> &, const double) { Assert (false, ExcNotImplemented()); -}; +} @@ -204,7 +204,7 @@ void GridGenerator::hyper_shell (Triangulation<1> &, const unsigned int) { Assert (false, ExcNotImplemented()); -}; +} #endif @@ -294,7 +294,7 @@ GridGenerator::hyper_cube_slit (Triangulation<2> &tria, ++cell; cell->face(3)->set_boundary_indicator(2); } -}; +} @@ -328,7 +328,7 @@ GridGenerator::hyper_L (Triangulation<2> &tria, tria.create_triangulation (std::vector >(&vertices[0], &vertices[8]), cells, SubCellData()); // no boundary information -}; +} @@ -368,7 +368,7 @@ GridGenerator::hyper_ball (Triangulation<2> &tria, tria.create_triangulation (std::vector >(&vertices[0], &vertices[8]), cells, SubCellData()); // no boundary information -}; +} @@ -428,7 +428,7 @@ void GridGenerator::hyper_shell (Triangulation<2> &tria, }; tria.create_triangulation (vertices, cells, SubCellData()); -}; +} @@ -499,7 +499,7 @@ GridGenerator::half_hyper_ball (Triangulation<2> &tria, tria.create_triangulation (std::vector >(&vertices[0], &vertices[8]), cells, SubCellData()); // no boundary information -}; +} @@ -568,7 +568,7 @@ GridGenerator::half_hyper_shell (Triangulation<2> &tria, }; tria.create_triangulation (vertices, cells, SubCellData()); -}; +} @@ -584,7 +584,7 @@ void GridGenerator::hyper_cube_slit (Triangulation<3> &, const bool) { Assert (false, ExcNotImplemented()); -}; +} @@ -705,7 +705,7 @@ GridGenerator::hyper_L (Triangulation<3> &tria, tria.create_triangulation (std::vector >(&vertices[0], &vertices[26]), cells, SubCellData()); // no boundary information -}; +} @@ -786,7 +786,7 @@ GridGenerator::hyper_ball (Triangulation<3> &/*tria*/, cells, SubCellData()); // no boundary information */ -}; +} @@ -868,7 +868,7 @@ GridGenerator::cylinder (Triangulation<3> &tria, cell->face(1)->set_boundary_indicator(2); ++cell; } -}; +} @@ -879,7 +879,7 @@ void GridGenerator::hyper_shell (Triangulation<3> &, const unsigned int ) { Assert (false, ExcNotImplemented()); -}; +} #endif diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index 15dbabae52..cfa1d92c0c 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -31,14 +31,14 @@ using namespace std; template GridIn::GridIn () : - tria(0) {}; + tria(0) {} template void GridIn::attach_triangulation (Triangulation &t) { tria = &t; -}; +} template @@ -202,7 +202,7 @@ void GridIn::read_ucd (std::istream &in) // ... and cells GridReordering::reorder_cells (cells); tria->create_triangulation (vertices, cells, subcelldata); -}; +} @@ -366,7 +366,7 @@ void GridIn::read_dbmesh (std::istream &in) // ...and cells GridReordering::reorder_cells (cells); tria->create_triangulation (vertices, cells, subcelldata); -}; +} @@ -394,7 +394,7 @@ void GridIn::skip_empty_lines (std::istream &in) // else: go on with next line }; -}; +} @@ -413,7 +413,7 @@ void GridIn::skip_comment_lines (std::istream &in, // put back first character of // first non-comment line in.putback (c); -}; +} @@ -469,7 +469,7 @@ GridIn::delete_unused_vertices (std::vector > &vertices, if (vertex_used[v] == true) tmp.push_back (vertices[v]); swap (vertices, tmp); -}; +} @@ -479,7 +479,7 @@ void GridIn::debug_output_grid (const std::vector > &/*cells* std::ostream &/*out*/) { Assert (false, ExcNotImplemented()); -}; +} #if deal_II_dimension == 2 @@ -550,7 +550,7 @@ GridIn<2>::debug_output_grid (const std::vector > &cells, << min_y << ':' << max_y << "] " << min_y << std::endl << "pause -1" << std::endl; -}; +} #endif @@ -626,7 +626,7 @@ GridIn<3>::debug_output_grid (const std::vector > &cells, << vertices[cells[cell].vertices[7]] << std::endl << std::endl << std::endl; }; -}; +} #endif diff --git a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc index 3127081cce..cccb80b99b 100644 --- a/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/grid_out.all_dimensions.cc @@ -27,7 +27,7 @@ namespace GridOutFlags write_diameter (write_diameter), write_measure (write_measure), write_all_faces (write_all_faces) - {}; + {} @@ -35,7 +35,7 @@ namespace GridOutFlags const bool write_faces) : write_preamble (write_preamble), write_faces (write_faces) - {}; + {} @@ -43,7 +43,7 @@ namespace GridOutFlags const unsigned int n_boundary_face_points) : write_cell_numbers (write_cell_numbers), n_boundary_face_points(n_boundary_face_points) - {}; + {} @@ -57,7 +57,7 @@ namespace GridOutFlags line_width (line_width), color_lines_on_user_flag(color_lines_on_user_flag), n_boundary_face_points(n_boundary_face_points) - {}; + {} @@ -70,7 +70,7 @@ namespace GridOutFlags EpsFlagsBase(size_type, size, line_width, color_lines_on_user_flag, n_boundary_face_points) - {}; + {} @@ -89,7 +89,7 @@ namespace GridOutFlags write_cell_numbers (write_cell_numbers), write_cell_number_level (write_cell_number_level), write_vertex_numbers (write_vertex_numbers) - {}; + {} @@ -106,50 +106,50 @@ namespace GridOutFlags n_boundary_face_points), azimut_angle (azimut_angle), turn_angle (turn_angle) - {}; -}; // end namespace GridOutFlags + {} +} // end namespace GridOutFlags void GridOut::set_flags (const GridOutFlags::DX &flags) { dx_flags = flags; -}; +} void GridOut::set_flags (const GridOutFlags::Ucd &flags) { ucd_flags = flags; -}; +} void GridOut::set_flags (const GridOutFlags::Gnuplot &flags) { gnuplot_flags = flags; -}; +} void GridOut::set_flags (const GridOutFlags::Eps<1> &flags) { eps_flags_1 = flags; -}; +} void GridOut::set_flags (const GridOutFlags::Eps<2> &flags) { eps_flags_2 = flags; -}; +} void GridOut::set_flags (const GridOutFlags::Eps<3> &flags) { eps_flags_3 = flags; -}; +} @@ -173,7 +173,7 @@ GridOut::default_suffix (const OutputFormat output_format) Assert (false, ExcNotImplemented()); return ""; }; -}; +} @@ -195,14 +195,14 @@ GridOut::parse_output_format (const std::string &format_name) AssertThrow (false, ExcInvalidState ()); // return something weird return OutputFormat(-1); -}; +} std::string GridOut::get_output_format_names () { return "dx|gnuplot|eps|ucd"; -}; +} @@ -214,4 +214,4 @@ GridOut::memory_consumption () const sizeof(eps_flags_1) + sizeof(eps_flags_2) + sizeof(eps_flags_3)); -}; +} diff --git a/deal.II/deal.II/source/grid/grid_out.cc b/deal.II/deal.II/source/grid/grid_out.cc index 68014e6a0e..9955ff6f24 100644 --- a/deal.II/deal.II/source/grid/grid_out.cc +++ b/deal.II/deal.II/source/grid/grid_out.cc @@ -364,7 +364,7 @@ void GridOut::write_ucd (const Triangulation &tria, write_ucd_faces (tria, cell_index, out); AssertThrow (out, ExcIO()); -}; +} @@ -373,7 +373,7 @@ void GridOut::write_ucd (const Triangulation &tria, unsigned int GridOut::n_boundary_faces (const Triangulation<1> &) const { return 0; -}; +} #endif @@ -392,7 +392,7 @@ unsigned int GridOut::n_boundary_faces (const Triangulation &tria) const n_faces++; return n_faces; -}; +} @@ -403,7 +403,7 @@ void GridOut::write_ucd_faces (const Triangulation<1> &, std::ostream &) const { return; -}; +} #endif @@ -439,7 +439,7 @@ void GridOut::write_ucd_faces (const Triangulation &tria, ++index; }; -}; +} #if deal_II_dimension==1 @@ -688,7 +688,7 @@ void GridOut::write_gnuplot (const Triangulation &tria, AssertThrow (out, ExcIO()); -}; +} #endif @@ -1111,7 +1111,7 @@ void GridOut::write_eps (const Triangulation &tria, out << "showpage" << std::endl; AssertThrow (out, ExcIO()); -}; +} #endif @@ -1142,7 +1142,7 @@ void GridOut::write (const Triangulation &tria, }; Assert (false, ExcInternalError()); -}; +} diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index 030a0f2b69..f965a9a715 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -106,7 +106,7 @@ void GridRefinement::refine (Triangulation &tria, for (unsigned int index=0; index= new_threshold) cell->set_refine_flag(); -}; +} @@ -127,7 +127,7 @@ void GridRefinement::coarsen (Triangulation &tria, if (std::fabs(criteria(index)) <= threshold) if (!cell->refine_flag_set()) cell->set_coarsen_flag(); -}; +} @@ -168,7 +168,7 @@ GridRefinement::refine_and_coarsen_fixed_number (Triangulation &tria, coarsen (tria, criteria, *(tmp.begin() + tmp.size() - coarsen_cells)); }; }; -}; +} @@ -256,7 +256,7 @@ GridRefinement::refine_and_coarsen_fixed_fraction (Triangulation &tria, if (bottom_threshold > *std::min_element(criteria.begin(), criteria.end())) coarsen (tria, criteria, bottom_threshold); -}; +} @@ -316,7 +316,7 @@ GridRefinement::refine_and_coarsen_optimize (Triangulation &tria, } } refine(tria,criteria,criteria(tmp[minArg])); -}; +} // explicit instantiations template void GridRefinement diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index 4eefed489b..5ea677f2a0 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -51,7 +51,7 @@ GridReordering::Cell::Cell () : { for (unsigned int i=0; i::faces_per_cell; ++i) neighbors[i] = invalid_neighbor; -}; +} @@ -62,7 +62,7 @@ GridReordering::Cell::Cell (const CellData &cd, { for (unsigned int i=0; i::faces_per_cell; ++i) neighbors[i] = invalid_neighbor; -}; +} template @@ -89,7 +89,7 @@ unsigned int GridReordering::Cell::count_neighbors () const if (neighbors[i] != invalid_neighbor) ++n; return n; -}; +} @@ -98,7 +98,7 @@ void GridReordering::Cell::insert_faces (std::map &/*global_faces*/) { Assert (false, ExcNotImplemented()); -}; +} #if deal_II_dimension == 2 @@ -212,7 +212,7 @@ GridReordering<2>::Cell::insert_faces (std::map &global_faces) faces[2][face]->second.adjacent_cells[1] = cell_no; }; }; -}; +} #endif @@ -555,7 +555,7 @@ GridReordering<3>::Cell::insert_faces (std::map &global_faces) faces[rot][face] = new_faces_ptr [cell_orientation_faces[rot][face].second] [cell_orientation_faces[rot][face].first]; -}; +} #endif @@ -580,7 +580,7 @@ void GridReordering::Cell::fix_cell_neighbors () else neighbors[face] = faces[0][face]->second.adjacent_cells[0]; }; -}; +} @@ -627,7 +627,7 @@ void GridReordering::Cell::find_backtracking_point () else if (track_back_to_cell == FaceData::invalid_adjacent_cell) track_back_to_cell = cell_no-1; -}; +} @@ -655,7 +655,7 @@ bool GridReordering::Cell::check_consistency (const unsigned int rot) const // no conflicts found return true; -}; +} @@ -669,7 +669,7 @@ void GridReordering::Cell::mark_faces_used (const unsigned int rot) ExcInternalError()); ++faces[rot][face]->second.use_count; }; -}; +} @@ -683,7 +683,7 @@ void GridReordering::Cell::mark_faces_unused (const unsigned int rot) ExcInternalError()); --faces[rot][face]->second.use_count; }; -}; +} @@ -707,7 +707,7 @@ bool GridReordering::Face::operator < (const Face &face) const // if all indices are equal: return false; -}; +} @@ -718,7 +718,7 @@ bool GridReordering::Face::operator == (const Face &face) const if (vertices[v] != face.vertices[v]) return false; return true; -}; +} @@ -727,7 +727,7 @@ GridReordering::FaceData::FaceData () : use_count (0) { adjacent_cells[0] = adjacent_cells[1] = invalid_adjacent_cell; -}; +} @@ -807,7 +807,7 @@ void GridReordering::track_back (std::vector &cells, // as a goto. goto top_of_function; }; -}; +} @@ -923,7 +923,7 @@ bool GridReordering::try_rotate_single_neighbors (std::vector &cells, // backtracking // cout << "Unsuccessfully tried to rotate neighbors of cell " << cell_no << endl; return false; -}; +} @@ -1110,7 +1110,7 @@ void GridReordering::find_reordering (std::vector &cells, }; // cout << "Done!" << endl; -}; +} @@ -1265,7 +1265,7 @@ GridReordering::presort_cells (std::vector &cells, i->second.adjacent_cells[k] = new_cell_numbers[i->second.adjacent_cells[k]]; return new_cell_numbers; -}; +} @@ -1330,7 +1330,7 @@ void GridReordering::reorder_cells (std::vector > &original_c // of for (typename std::map::iterator i=faces.begin(); i!=faces.end(); ++i) Assert (i->second.use_count == 0, ExcInternalError()); -}; +} @@ -1341,7 +1341,7 @@ void GridReordering<1>::reorder_cells (std::vector > &) { // there should not be much to do // in 1d... -}; +} #endif diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index d7109293f0..1d0bd53fe1 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -70,7 +70,7 @@ GridTools::diameter (const Triangulation &tria) }; return std::sqrt(max_distance_sqr); -}; +} #else @@ -88,7 +88,7 @@ GridTools::diameter (const Triangulation<1> &tria) while (!rightmost->at_boundary(1)) rightmost = rightmost->neighbor(1); return std::sqrt((leftmost->vertex(0) - rightmost->vertex(1)).square()); -}; +} #endif @@ -151,7 +151,7 @@ namespace private: const double factor; }; -}; +} template @@ -160,7 +160,7 @@ GridTools::shift (const Point &shift_vector, Triangulation &triangulation) { transform (ShiftPoint(shift_vector), triangulation); -}; +} #if deal_II_dimension == 2 @@ -170,7 +170,7 @@ GridTools::rotate (const double angle, Triangulation<2> &triangulation) { transform (Rotate2d(angle), triangulation); -}; +} #endif @@ -182,7 +182,7 @@ GridTools::scale (const double scaling_factor, { Assert (scaling_factor>0, ExcScalingFactorNotPositive (scaling_factor)); transform (ScalePoint(scaling_factor), triangulation); -}; +} diff --git a/deal.II/deal.II/source/grid/intergrid_map.cc b/deal.II/deal.II/source/grid/intergrid_map.cc index 2b37c41eed..9b64c079ac 100644 --- a/deal.II/deal.II/source/grid/intergrid_map.cc +++ b/deal.II/deal.II/source/grid/intergrid_map.cc @@ -40,7 +40,7 @@ get_n_levels (const GridClass &grid) // of this object, there is a // specialization of this function return grid.get_tria().n_levels(); -}; +} // specialization for grid==tria @@ -51,7 +51,7 @@ get_n_levels (const Triangulation &grid) // if GridClass==Triangulation, then // we can ask directly. return grid.n_levels(); -}; +} template