]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Use the same type for a non-type template argument in declaration/definition. 2864/head
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 25 Jul 2016 20:47:08 +0000 (15:47 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 25 Jul 2016 20:47:08 +0000 (15:47 -0500)
We previously had used 'int' in the declaration but 'std::size_t' in the definition of the
MemoryConsumption::memory_consumption(std_cxx::array) function. The latter is the type
the C++ standard says 'std::array' should take for its size, so be consistent about this.

include/deal.II/base/memory_consumption.h

index 64b3a4e74fb145a34e14f90ab2d19bf047a79ba9..d5da40ef980a239d9861b9fe3dfb0fe6b78b6f71 100644 (file)
@@ -195,7 +195,7 @@ namespace MemoryConsumption
    * arrays of strings, etc, where the individual elements may have vastly
    * different sizes.
    */
-  template <typename T, int N>
+  template <typename T, std::size_t N>
   inline
   std::size_t memory_consumption (const std_cxx11::array<T,N> &v);
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.