From: Wolfgang Bangerth Date: Mon, 25 Jul 2016 20:47:08 +0000 (-0500) Subject: Use the same type for a non-type template argument in declaration/definition. X-Git-Tag: v8.5.0-rc1~845^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2864%2Fhead;p=dealii.git Use the same type for a non-type template argument in declaration/definition. 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. --- diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h index 64b3a4e74f..d5da40ef98 100644 --- a/include/deal.II/base/memory_consumption.h +++ b/include/deal.II/base/memory_consumption.h @@ -195,7 +195,7 @@ namespace MemoryConsumption * arrays of strings, etc, where the individual elements may have vastly * different sizes. */ - template + template inline std::size_t memory_consumption (const std_cxx11::array &v);