]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove a workaround for an old XLC compiler.
authorDavid Wells <wellsd2@rpi.edu>
Fri, 2 Oct 2015 17:37:41 +0000 (13:37 -0400)
committerDavid Wells <wellsd2@rpi.edu>
Fri, 2 Oct 2015 19:19:09 +0000 (15:19 -0400)
As far as I can tell, this compiler reached end of life status over ten
years ago.

include/deal.II/base/memory_consumption.h
source/base/CMakeLists.txt
source/base/memory_consumption.cc [deleted file]

index 83f9c7baa0765e81651628e9a940f16a1cf6e04a..68e6d091c0ca4edae116951e3a46393652a3135d 100644 (file)
@@ -300,15 +300,6 @@ namespace MemoryConsumption
   inline
   std::size_t memory_consumption (const std::vector<T *> &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<std::string> &v);
-
 
   /**
    * Determine an estimate of the amount of memory in bytes consumed by a pair
index 2656f896062a80c2a9b4aea5662783d082a01bf3..d780f23651b0c3310f6020f9a4742120a11b6f6f 100644 (file)
@@ -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 (file)
index 7a65ae2..0000000
+++ /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/base/memory_consumption.h>
-
-DEAL_II_NAMESPACE_OPEN
-
-
-namespace MemoryConsumption
-{
-  std::size_t
-  memory_consumption (const std::vector<std::string> &v)
-  {
-    std::size_t mem = sizeof(v);
-    for (unsigned int i=0; i<v.size(); ++i)
-      mem += memory_consumption(v[i]);
-    return mem;
-  }
-
-
-}
-
-DEAL_II_NAMESPACE_CLOSE

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.