From 1a5bc4740f4bf168a3ed57908f604192d231ec50 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 20 Mar 2002 12:41:52 +0000 Subject: [PATCH] Suns Forte wants that if a function is defined inline then it must also be declared inline. Do this. git-svn-id: https://svn.dealii.org/trunk@5596 0785d39b-7218-0410-832d-ea1e28bc413d --- .../base/include/base/memory_consumption.h | 53 +++++++++++++------ deal.II/base/include/base/thread_management.h | 19 +++++++ 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index 40b2e9c949..eb078e5aeb 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -88,6 +88,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{bool} * variable. */ + inline unsigned int memory_consumption (const bool); /** @@ -95,6 +96,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{char} * variable. */ + inline unsigned int memory_consumption (const char); /** @@ -102,6 +104,7 @@ namespace MemoryConsumption * in bytes consumed by a * @p{short int} variable. */ + inline unsigned int memory_consumption (const short int); /** @@ -109,6 +112,7 @@ namespace MemoryConsumption * in bytes consumed by a * @p{short unsigned int} variable. */ + inline unsigned int memory_consumption (const short unsigned int); /** @@ -116,6 +120,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{int} * variable. */ + inline unsigned int memory_consumption (const int); /** @@ -123,6 +128,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{unsigned int} * variable. */ + inline unsigned int memory_consumption (const unsigned int); /** @@ -130,6 +136,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{float} * variable. */ + inline unsigned int memory_consumption (const float); /** @@ -137,6 +144,7 @@ namespace MemoryConsumption * in bytes consumed by a @p{double} * variable. */ + inline unsigned int memory_consumption (const double); /** @@ -145,6 +153,7 @@ namespace MemoryConsumption * consumed by a @p{std::string} * variable. */ + inline unsigned int memory_consumption (const std::string &s); /** @@ -195,6 +204,7 @@ namespace MemoryConsumption * vectors of bools. */ template + inline unsigned int memory_consumption (const typename std::vector &v); /** @@ -213,6 +223,7 @@ namespace MemoryConsumption * elements. */ template + inline unsigned int memory_consumption (const T (&v)[N]); /** @@ -226,6 +237,7 @@ namespace MemoryConsumption * one-by-one, but as a bit * field. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -234,6 +246,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of @p{int}s. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -242,6 +255,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of @p{double}s. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -250,6 +264,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of @p{float}s. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -258,6 +273,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of @p{char}s. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -266,6 +282,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of @p{unsigned char}s. */ + inline unsigned int memory_consumption (const std::vector &v); /** @@ -275,6 +292,7 @@ namespace MemoryConsumption * for a vector of pointers. */ template + inline unsigned int memory_consumption (const typename std::vector &v); /** @@ -283,7 +301,7 @@ namespace MemoryConsumption * consumption of a vector, here * for a vector of strings. This * function is not necessary from a - * struct C++ viewpoint, since it + * strict C++ viewpoint, since it * could be generated, but is * necessary for compatibility with * IBM's xlC 5.0 compiler, and @@ -299,6 +317,7 @@ namespace MemoryConsumption * consumed by a pair of values. */ template + inline unsigned int memory_consumption (const typename std::pair &p); /** @@ -310,6 +329,7 @@ namespace MemoryConsumption * pointed to. */ template + inline unsigned int memory_consumption (const T * const); /** @@ -325,6 +345,7 @@ namespace MemoryConsumption * pointers */ template + inline unsigned int memory_consumption (T * const); /** @@ -342,6 +363,7 @@ namespace MemoryConsumption * @p{T*} template function * above. */ + inline unsigned int memory_consumption (void * const); @@ -357,6 +379,7 @@ namespace MemoryConsumption * does not work. */ template + inline unsigned int memory_consumption (const T &t); } @@ -451,7 +474,7 @@ namespace MemoryConsumption mem += memory_consumption(v[i]); mem += (v.capacity() - n)*sizeof(T); return mem; - }; + } @@ -462,7 +485,7 @@ namespace MemoryConsumption for (unsigned int i=0; i &v) { return v.capacity() / 8 + sizeof(v); - }; + } @@ -479,7 +502,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(int) + sizeof(v)); - }; + } @@ -488,7 +511,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(double) + sizeof(v)); - }; + } @@ -497,7 +520,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(float) + sizeof(v)); - }; + } @@ -506,7 +529,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(char) + sizeof(v)); - }; + } @@ -515,7 +538,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(unsigned char) + sizeof(v)); - }; + } @@ -525,7 +548,7 @@ namespace MemoryConsumption { return (v.capacity() * sizeof(T *) + sizeof(v)); - }; + } @@ -535,7 +558,7 @@ namespace MemoryConsumption { return (memory_consumption(p.first) + memory_consumption(p.second)); - }; + } @@ -545,7 +568,7 @@ namespace MemoryConsumption memory_consumption (const T * const) { return sizeof(T*); - }; + } @@ -555,7 +578,7 @@ namespace MemoryConsumption memory_consumption (T * const) { return sizeof(T*); - }; + } @@ -564,7 +587,7 @@ namespace MemoryConsumption memory_consumption (void * const) { return sizeof(void*); - }; + } @@ -574,7 +597,7 @@ namespace MemoryConsumption memory_consumption (const T &t) { return t.memory_consumption(); - }; + } } diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h index 580fa07692..aeccaee8d4 100644 --- a/deal.II/base/include/base/thread_management.h +++ b/deal.II/base/include/base/thread_management.h @@ -2886,6 +2886,7 @@ namespace Threads * This function exists once for * each number of parameters. */ + inline FunData0::ArgCollector encapsulate (void (*fun_ptr)()); @@ -2901,6 +2902,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData1::ArgCollector encapsulate (void (*fun_ptr)(Arg1)); @@ -2917,6 +2919,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData2::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2)); @@ -2933,6 +2936,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData3::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3)); @@ -2949,6 +2953,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData4::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4)); @@ -2966,6 +2971,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData5::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5)); @@ -2982,6 +2988,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData6::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6)); @@ -2998,6 +3005,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData7::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7)); @@ -3014,6 +3022,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData8::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8)); @@ -3030,6 +3039,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData9::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9)); @@ -3046,6 +3056,7 @@ namespace Threads * each number of parameters. */ template + inline typename FunData10::ArgCollector encapsulate (void (*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10)); @@ -3063,6 +3074,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData0::ArgCollector encapsulate (void (Class::*fun_ptr)()); @@ -3079,6 +3091,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData1::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1)); @@ -3096,6 +3109,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData2::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2)); @@ -3113,6 +3127,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData3::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2, Arg3)); @@ -3130,6 +3145,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData4::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2, Arg3, Arg4)); @@ -3147,6 +3163,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData5::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5)); @@ -3164,6 +3181,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData6::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6)); @@ -3180,6 +3198,7 @@ namespace Threads * each number of parameters. */ template + inline typename MemFunData7::ArgCollector encapsulate (void (Class::*fun_ptr)(Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7)); -- 2.39.5