From: David Wells Date: Fri, 2 Oct 2015 17:37:41 +0000 (-0400) Subject: Remove a workaround for an old XLC compiler. X-Git-Tag: v8.4.0-rc2~339^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0b790d56a5e852b41e629c668df3ec1237826a7;p=dealii.git Remove a workaround for an old XLC compiler. As far as I can tell, this compiler reached end of life status over ten years ago. --- diff --git a/include/deal.II/base/memory_consumption.h b/include/deal.II/base/memory_consumption.h index 83f9c7baa0..68e6d091c0 100644 --- a/include/deal.II/base/memory_consumption.h +++ b/include/deal.II/base/memory_consumption.h @@ -300,15 +300,6 @@ namespace MemoryConsumption inline std::size_t memory_consumption (const std::vector &v); - /** - * Specialization of the determination of the memory consumption of a - * vector, here for a vector of strings. This function is not necessary from - * a strict C++ viewpoint, since it could be generated, but is necessary for - * compatibility with IBM's xlC 5.0 compiler, and doesn't harm for other - * compilers as well. - */ - std::size_t memory_consumption (const std::vector &v); - /** * Determine an estimate of the amount of memory in bytes consumed by a pair diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index 2656f89606..d780f23651 100644 --- a/source/base/CMakeLists.txt +++ b/source/base/CMakeLists.txt @@ -34,7 +34,6 @@ SET(_src index_set.cc job_identifier.cc logstream.cc - memory_consumption.cc mpi.cc multithread_info.cc named_selection.cc diff --git a/source/base/memory_consumption.cc b/source/base/memory_consumption.cc deleted file mode 100644 index 7a65ae2dc4..0000000000 --- a/source/base/memory_consumption.cc +++ /dev/null @@ -1,35 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2000 - 2014 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - -#include - -DEAL_II_NAMESPACE_OPEN - - -namespace MemoryConsumption -{ - std::size_t - memory_consumption (const std::vector &v) - { - std::size_t mem = sizeof(v); - for (unsigned int i=0; i