From 907cfcd5f49133d2ee04e6673b61f04bbc04844d Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 6 Apr 2007 17:23:03 +0000 Subject: [PATCH] Remove stray semicolons git-svn-id: https://svn.dealii.org/trunk@14618 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/exceptions.h | 32 +-- deal.II/base/include/base/parameter_handler.h | 4 +- deal.II/base/include/base/thread_management.h | 234 +++++++++--------- deal.II/contrib/functionparser/fparser.h | 2 +- deal.II/deal.II/include/grid/tria_accessor.h | 2 +- deal.II/deal.II/source/grid/grid_tools.cc | 12 +- deal.II/lac/include/lac/vector_memory.h | 4 +- 7 files changed, 145 insertions(+), 145 deletions(-) diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index eb278b549a..a2c774636c 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, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -442,11 +442,11 @@ class Exception0 : public dealii::ExceptionBase {} #define DeclException1(Exception1, type1, outsequence) \ class Exception1 : public dealii::ExceptionBase { \ public: \ - Exception1 (const type1 a1) : arg1 (a1) {}; \ - virtual ~Exception1 () throw () {}; \ + Exception1 (const type1 a1) : arg1 (a1) {} \ + virtual ~Exception1 () throw () {} \ virtual void print_info (std::ostream &out) const { \ out outsequence << std::endl; \ - }; \ + } \ private: \ const type1 arg1; \ } @@ -462,11 +462,11 @@ class Exception1 : public dealii::ExceptionBase { \ class Exception2 : public dealii::ExceptionBase { \ public: \ Exception2 (const type1 a1, const type2 a2) : \ - arg1 (a1), arg2(a2) {}; \ - virtual ~Exception2 () throw () {}; \ + arg1 (a1), arg2(a2) {} \ + virtual ~Exception2 () throw () {} \ virtual void print_info (std::ostream &out) const { \ out outsequence << std::endl; \ - }; \ + } \ private: \ const type1 arg1; \ const type2 arg2; \ @@ -483,11 +483,11 @@ class Exception2 : public dealii::ExceptionBase { \ class Exception3 : public dealii::ExceptionBase { \ public: \ Exception3 (const type1 a1, const type2 a2, const type3 a3) : \ - arg1 (a1), arg2(a2), arg3(a3) {}; \ - virtual ~Exception3 () throw () {}; \ + arg1 (a1), arg2(a2), arg3(a3) {} \ + virtual ~Exception3 () throw () {} \ virtual void print_info (std::ostream &out) const { \ out outsequence << std::endl; \ - }; \ + } \ private: \ const type1 arg1; \ const type2 arg2; \ @@ -506,11 +506,11 @@ class Exception4 : public dealii::ExceptionBase { \ public: \ Exception4 (const type1 a1, const type2 a2, \ const type3 a3, const type4 a4) : \ - arg1 (a1), arg2(a2), arg3(a3), arg4(a4) {}; \ - virtual ~Exception4 () throw () {}; \ + arg1 (a1), arg2(a2), arg3(a3), arg4(a4) {} \ + virtual ~Exception4 () throw () {} \ virtual void print_info (std::ostream &out) const { \ out outsequence << std::endl; \ - }; \ + } \ private: \ const type1 arg1; \ const type2 arg2; \ @@ -530,11 +530,11 @@ class Exception5 : public dealii::ExceptionBase { \ public: \ Exception5 (const type1 a1, const type2 a2, const type3 a3, \ const type4 a4, const type5 a5) : \ - arg1 (a1), arg2(a2), arg3(a3), arg4(a4), arg5(a5) {}; \ - virtual ~Exception5 () throw () {}; \ + arg1 (a1), arg2(a2), arg3(a3), arg4(a4), arg5(a5) {} \ + virtual ~Exception5 () throw () {} \ virtual void print_info (std::ostream &out) const { \ out outsequence << std::endl; \ - }; \ + } \ private: \ const type1 arg1; \ const type2 arg2; \ diff --git a/deal.II/base/include/base/parameter_handler.h b/deal.II/base/include/base/parameter_handler.h index c27a4eb20f..fe205aecf5 100644 --- a/deal.II/base/include/base/parameter_handler.h +++ b/deal.II/base/include/base/parameter_handler.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -2096,7 +2096,7 @@ class MultipleParameterLoop : public ParameterHandler /** * Constructor */ - Entry () {}; + Entry () {} /** * Construct an object with given subsection diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 5a477a454b..23524e2f7d 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -103,7 +103,7 @@ namespace Threads * dummy mutex class, this * of course does nothing. */ - ScopedLock (DummyThreadMutex &) {}; + ScopedLock (DummyThreadMutex &) {} /** * Destructor. Unlock the @@ -111,7 +111,7 @@ namespace Threads * dummy mutex class, this * of course does nothing. */ - ~ScopedLock () {}; + ~ScopedLock () {} }; /** @@ -121,7 +121,7 @@ namespace Threads * function does nothing as * well. */ - inline void acquire () const {}; + inline void acquire () const {} /** * Simulate release of the @@ -130,7 +130,7 @@ namespace Threads * function does nothing as * well. */ - inline void release () const {}; + inline void release () const {} }; @@ -165,7 +165,7 @@ namespace Threads * this function of course does * nothing. */ - inline void signal () {}; + inline void signal () {} /** * Signal to multiple listener @@ -176,7 +176,7 @@ namespace Threads * this function of course does * nothing. */ - inline void broadcast () {}; + inline void broadcast () {} /** * Wait for the condition to be @@ -192,7 +192,7 @@ namespace Threads * of course does nothing, but * returns immediately. */ - inline void wait (DummyThreadMutex &) {}; + inline void wait (DummyThreadMutex &) {} }; @@ -237,13 +237,13 @@ namespace Threads * i.e. this function is a * no-op. */ - int wait () { return 0; }; + int wait () { return 0; } /** * Dump the state of this * object. Here: do nothing. */ - void dump () {}; + void dump () {} /** @addtogroup Exceptions * @{ */ @@ -312,7 +312,7 @@ namespace Threads * Constructor. Lock the * mutex. */ - ScopedLock (PosixThreadMutex &m) : mutex(m) { mutex.acquire(); }; + ScopedLock (PosixThreadMutex &m) : mutex(m) { mutex.acquire(); } /** * Destructor. Unlock the @@ -320,7 +320,7 @@ namespace Threads * dummy mutex class, this * of course does nothing. */ - ~ScopedLock () { mutex.release (); }; + ~ScopedLock () { mutex.release (); } private: /** @@ -346,12 +346,12 @@ namespace Threads /** * Acquire a mutex. */ - inline void acquire () { pthread_mutex_lock(&mutex); }; + inline void acquire () { pthread_mutex_lock(&mutex); } /** * Release the mutex again. */ - inline void release () { pthread_mutex_unlock(&mutex); }; + inline void release () { pthread_mutex_unlock(&mutex); } private: /** @@ -405,7 +405,7 @@ namespace Threads * met, i.e. that some data * will now be available. */ - inline void signal () { pthread_cond_signal(&cond); }; + inline void signal () { pthread_cond_signal(&cond); } /** * Signal to multiple listener @@ -413,7 +413,7 @@ namespace Threads * met, i.e. that some data * will now be available. */ - inline void broadcast () { pthread_cond_broadcast(&cond); }; + inline void broadcast () { pthread_cond_broadcast(&cond); } /** * Wait for the condition to be @@ -427,7 +427,7 @@ namespace Threads * mechanisms. */ inline void wait (PosixThreadMutex &mutex) - { pthread_cond_wait(&cond, &mutex.mutex); }; + { pthread_cond_wait(&cond, &mutex.mutex); } private: /** @@ -2898,7 +2898,7 @@ namespace Threads /** * Constructor. */ - thread_description_base () : was_joined (false) {}; + thread_description_base () : was_joined (false) {} /** * Destructor. @@ -3007,7 +3007,7 @@ namespace Threads public: #endif Thread (const boost::shared_ptr > &td) - : thread_descriptor (td) {}; + : thread_descriptor (td) {} public: @@ -3020,7 +3020,7 @@ namespace Threads * data created by the * spawn functions. */ - Thread () {}; + Thread () {} /** * Join the thread represented @@ -3035,7 +3035,7 @@ namespace Threads void join () const { AssertThrow (thread_descriptor, ExcNoThread()); thread_descriptor->join (); - }; + } /** * Get the return value of the @@ -3048,7 +3048,7 @@ namespace Threads RT return_value () { join (); return thread_descriptor->ret_val.get(); - }; + } /** @@ -3062,7 +3062,7 @@ namespace Threads */ bool operator == (const Thread &t) { return thread_descriptor == t.thread_descriptor; - }; + } /** @addtogroup Exceptions * @{ */ @@ -3218,7 +3218,7 @@ namespace Threads fun_wrapper (FunPtr fun_ptr, const ArgReferences &args) : fun_ptr (fun_ptr), - args (args) {}; + args (args) {} private: /** * Default constructor. Made @@ -3309,7 +3309,7 @@ namespace Threads internal::deregister_thread (); return 0; - }; + } /** @@ -3373,7 +3373,7 @@ namespace Threads : c (c), mem_fun_ptr (mem_fun_ptr), - args (args) {}; + args (args) {} private: /** * Default constructor. Made @@ -3467,7 +3467,7 @@ namespace Threads internal::deregister_thread (); return 0; - }; + } /** * Make the base class a @@ -3556,14 +3556,14 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread operator() () { return mem_fun_wrapper (mem_fun_ptr, c, ArgList()).fire_up (); - }; + } private: C &c; @@ -3615,14 +3615,14 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread operator() (typename boost::tuples::element<0,ArgList>::type arg1) { return mem_fun_wrapper (mem_fun_ptr, c, boost::tie(arg1)).fire_up (); - }; + } private: C &c; @@ -3675,7 +3675,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -3684,7 +3684,7 @@ namespace Threads return mem_fun_wrapper (mem_fun_ptr, c, boost::tie(arg1, arg2)).fire_up (); - }; + } private: C &c; @@ -3735,7 +3735,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -3746,7 +3746,7 @@ namespace Threads boost::tie(arg1, arg2, arg3)).fire_up (); - }; + } private: C &c; @@ -3802,7 +3802,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -3813,7 +3813,7 @@ namespace Threads return mem_fun_wrapper (mem_fun_ptr, c, boost::tie(arg1,arg2, arg3,arg4)).fire_up (); - }; + } private: C &c; @@ -3869,7 +3869,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -3882,7 +3882,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5)).fire_up (); - }; + } private: C &c; @@ -3940,7 +3940,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -3954,7 +3954,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5,arg6)).fire_up (); - }; + } private: C &c; @@ -4013,7 +4013,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -4029,7 +4029,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7)).fire_up (); - }; + } private: C &c; @@ -4094,7 +4094,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -4111,7 +4111,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7,arg8)).fire_up (); - }; + } private: C &c; @@ -4180,7 +4180,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -4199,7 +4199,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9)).fire_up (); - }; + } private: C &c; @@ -4268,7 +4268,7 @@ namespace Threads public: inline mem_fun_encapsulator (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -4288,7 +4288,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9, arg10)).fire_up (); - }; + } private: C &c; @@ -4362,14 +4362,14 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread operator() () { return fun_wrapper (fun_ptr, ArgList()).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4408,14 +4408,14 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread operator() (typename boost::tuples::element<0,ArgList>::type arg1) { return fun_wrapper (fun_ptr, boost::tie(arg1)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4453,7 +4453,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4462,7 +4462,7 @@ namespace Threads return fun_wrapper (fun_ptr, boost::tie(arg1, arg2)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4499,7 +4499,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4510,7 +4510,7 @@ namespace Threads boost::tie(arg1, arg2, arg3)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4550,7 +4550,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4561,7 +4561,7 @@ namespace Threads return fun_wrapper (fun_ptr, boost::tie(arg1,arg2, arg3,arg4)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4601,7 +4601,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4614,7 +4614,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4654,7 +4654,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4668,7 +4668,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5,arg6)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4708,7 +4708,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4724,7 +4724,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4767,7 +4767,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4784,7 +4784,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7,arg8)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4829,7 +4829,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4848,7 +4848,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4893,7 +4893,7 @@ namespace Threads public: inline fun_encapsulator (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -4913,7 +4913,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9, arg10)).fire_up (); - }; + } private: FunPtr fun_ptr; @@ -4953,7 +4953,7 @@ namespace Threads /** * Default constructor. */ - Thread () {}; + Thread () {} /** * Initialize the return value @@ -5092,7 +5092,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5159,14 +5159,14 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread operator() (typename boost::tuples::element<0,ArgList>::type arg1) { return Thread (mem_fun_ptr, c, boost::tie(arg1)); - }; + } private: C &c; @@ -5227,7 +5227,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5236,7 +5236,7 @@ namespace Threads return Thread (mem_fun_ptr, c, boost::tie(arg1, arg2)); - }; + } private: C &c; @@ -5296,7 +5296,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5307,7 +5307,7 @@ namespace Threads boost::tie(arg1, arg2, arg3)); - }; + } private: C &c; @@ -5372,7 +5372,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5383,7 +5383,7 @@ namespace Threads return Thread (mem_fun_ptr, c, boost::tie(arg1,arg2, arg3,arg4)); - }; + } private: C &c; @@ -5448,7 +5448,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5461,7 +5461,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5)); - }; + } private: C &c; @@ -5528,7 +5528,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5542,7 +5542,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5,arg6)); - }; + } private: C &c; @@ -5610,7 +5610,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5626,7 +5626,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7)); - }; + } private: C &c; @@ -5700,7 +5700,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5717,7 +5717,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7,arg8)); - }; + } private: C &c; @@ -5795,7 +5795,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5814,7 +5814,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9)); - }; + } private: C &c; @@ -5892,7 +5892,7 @@ namespace Threads public: inline mem_fun_forwarder (C &c, MemFunPtr mem_fun_ptr) - : c (c), mem_fun_ptr(mem_fun_ptr) {}; + : c (c), mem_fun_ptr(mem_fun_ptr) {} inline Thread @@ -5912,7 +5912,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9, arg10)); - }; + } private: C &c; @@ -5994,14 +5994,14 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread operator() () { return Thread (fun_ptr, ArgList()); - }; + } private: FunPtr fun_ptr; @@ -6046,14 +6046,14 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread operator() (typename boost::tuples::element<0,ArgList>::type arg1) { return Thread (fun_ptr, boost::tie(arg1)); - }; + } private: FunPtr fun_ptr; @@ -6096,7 +6096,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6105,7 +6105,7 @@ namespace Threads return Thread (fun_ptr, boost::tie(arg1, arg2)); - }; + } private: FunPtr fun_ptr; @@ -6147,7 +6147,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6158,7 +6158,7 @@ namespace Threads boost::tie(arg1, arg2, arg3)); - }; + } private: FunPtr fun_ptr; @@ -6203,7 +6203,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6214,7 +6214,7 @@ namespace Threads return Thread (fun_ptr, boost::tie(arg1,arg2, arg3,arg4)); - }; + } private: FunPtr fun_ptr; @@ -6259,7 +6259,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6272,7 +6272,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5)); - }; + } private: FunPtr fun_ptr; @@ -6317,7 +6317,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6331,7 +6331,7 @@ namespace Threads boost::tie(arg1,arg2, arg3,arg4, arg5,arg6)); - }; + } private: FunPtr fun_ptr; @@ -6376,7 +6376,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6392,7 +6392,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7)); - }; + } private: FunPtr fun_ptr; @@ -6440,7 +6440,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6457,7 +6457,7 @@ namespace Threads arg3,arg4, arg5,arg6, arg7,arg8)); - }; + } private: FunPtr fun_ptr; @@ -6507,7 +6507,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6526,7 +6526,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9)); - }; + } private: FunPtr fun_ptr; @@ -6576,7 +6576,7 @@ namespace Threads public: inline fun_forwarder (FunPtr fun_ptr) - : fun_ptr(fun_ptr) {}; + : fun_ptr(fun_ptr) {} inline Thread @@ -6596,7 +6596,7 @@ namespace Threads arg5,arg6, arg7,arg8, arg9, arg10)); - }; + } private: FunPtr fun_ptr; @@ -6659,7 +6659,7 @@ namespace Threads ThreadGroup & operator += (const Thread &t) { threads.push_back (t); return *this; - }; + } /** * Wait for all threads in the @@ -6677,7 +6677,7 @@ namespace Threads for (typename std::list >::const_iterator t=threads.begin(); t!=threads.end(); ++t) t->join (); - }; + } private: /** diff --git a/deal.II/contrib/functionparser/fparser.h b/deal.II/contrib/functionparser/fparser.h index 2b4f6aa514..c28cf5defa 100644 --- a/deal.II/contrib/functionparser/fparser.h +++ b/deal.II/contrib/functionparser/fparser.h @@ -68,7 +68,7 @@ public: // Added by Luca Heltai. For consistency checking. unsigned int NVars() { return data->varAmount; - }; + } //======================================================================== diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 798cb29301..1832356a21 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -1150,7 +1150,7 @@ class TriaObjectAccessor<0, dim> : public TriaAccessor<0,dim> TriaAccessor<0,dim> (parent, level, index, local_data) { Assert (false, ExcInternalError()); - }; + } }; diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index b076738097..c30d15faa2 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -452,11 +452,11 @@ GridTools::delete_duplicated_vertices (std::vector > &vertices, ShiftPoint (const Point &shift) : shift(shift) - {}; + {} Point operator() (const Point p) const { return p+shift; - }; + } private: const Point shift; }; @@ -472,12 +472,12 @@ GridTools::delete_duplicated_vertices (std::vector > &vertices, Rotate2d (const double angle) : angle(angle) - {}; + {} Point<2> operator() (const Point<2> p) const { return Point<2> (std::cos(angle)*p(0) - std::sin(angle) * p(1), std::sin(angle)*p(0) + std::cos(angle) * p(1)); - }; + } private: const double angle; }; @@ -491,11 +491,11 @@ GridTools::delete_duplicated_vertices (std::vector > &vertices, ScalePoint (const double factor) : factor(factor) - {}; + {} Point operator() (const Point p) const { return p*factor; - }; + } private: const double factor; }; diff --git a/deal.II/lac/include/lac/vector_memory.h b/deal.II/lac/include/lac/vector_memory.h index 801d8656b0..774592e157 100644 --- a/deal.II/lac/include/lac/vector_memory.h +++ b/deal.II/lac/include/lac/vector_memory.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -75,7 +75,7 @@ class VectorMemory : public Subscriptor * as there are virtual functions * in this class. */ - virtual ~VectorMemory() {}; + virtual ~VectorMemory() {} /** * Return a pointer to a new -- 2.39.5