From 094d5aa9867a8f1f0c6a6713f1bb619545136088 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 25 Jul 2016 15:47:08 -0500 Subject: [PATCH] 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. --- include/deal.II/base/memory_consumption.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.39.5