From: bangerth Date: Wed, 27 Oct 2010 18:08:42 +0000 (+0000) Subject: Use the preprocessor to expand template instantiations, rather than doing it by hand. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d97a8e5124bfea1dcfb6588749c88034983b51a3;p=dealii-svn.git Use the preprocessor to expand template instantiations, rather than doing it by hand. git-svn-id: https://svn.dealii.org/trunk@22523 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/lac/vector_memory.cc b/deal.II/source/lac/vector_memory.cc index 267dca6fb8..c04554bc12 100644 --- a/deal.II/source/lac/vector_memory.cc +++ b/deal.II/source/lac/vector_memory.cc @@ -217,33 +217,4 @@ GrowingVectorMemory::memory_consumption () const #include "vector_memory.inst" -//TODO: Fold this into the list of vectors to be instantiated -#ifdef DEAL_II_USE_PETSC - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; -#endif - -#ifdef DEAL_II_USE_TRILINOS - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; - - template class VectorMemory; - template class GrowingVectorMemory; -#endif - DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/source/lac/vector_memory.inst.in b/deal.II/source/lac/vector_memory.inst.in index 535a739a6c..39228c1fdd 100644 --- a/deal.II/source/lac/vector_memory.inst.in +++ b/deal.II/source/lac/vector_memory.inst.in @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -12,23 +12,8 @@ //--------------------------------------------------------------------------- -for (SCALAR : REAL_SCALARS) +for (VECTOR : SERIAL_VECTORS) { - template class VectorMemory >; - template class GrowingVectorMemory >; - - - template class VectorMemory >; - template class GrowingVectorMemory >; - } - - -for (SCALAR : COMPLEX_SCALARS) - { - template class VectorMemory >; - template class GrowingVectorMemory >; - - template class VectorMemory >; - template class GrowingVectorMemory >; + template class VectorMemory; + template class GrowingVectorMemory; } -