From ab474b5e8b00559e3b89b064331cda34ca4f45eb Mon Sep 17 00:00:00 2001 From: kronbichler Date: Mon, 27 Jun 2011 16:34:39 +0000 Subject: [PATCH] Fix memory consumption of std::vector with more than 4G. git-svn-id: https://svn.dealii.org/trunk@23871 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/memory_consumption.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/include/deal.II/base/memory_consumption.h b/deal.II/include/deal.II/base/memory_consumption.h index 7faef9028d..ea2757024f 100644 --- a/deal.II/include/deal.II/base/memory_consumption.h +++ b/deal.II/include/deal.II/base/memory_consumption.h @@ -514,7 +514,7 @@ namespace MemoryConsumption template std::size_t memory_consumption (const std::vector &v) { - unsigned int mem = sizeof(std::vector); + std::size_t mem = sizeof(std::vector); const unsigned int n = v.size(); for (unsigned int i=0; i std::size_t memory_consumption (const T (&v)[N]) { - unsigned int mem = 0; + std::size_t mem = 0; for (unsigned int i=0; i