]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Use the preprocessor to expand template instantiations, rather than doing it by hand.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Oct 2010 18:08:42 +0000 (18:08 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 27 Oct 2010 18:08:42 +0000 (18:08 +0000)
git-svn-id: https://svn.dealii.org/trunk@22523 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/lac/vector_memory.cc
deal.II/source/lac/vector_memory.inst.in

index 267dca6fb8b1e26c673573a20379c7d24d5b97be..c04554bc12e08b117a691bec3519f6a71b151c00 100644 (file)
@@ -217,33 +217,4 @@ GrowingVectorMemory<VECTOR>::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<PETScWrappers::Vector>;
-    template class GrowingVectorMemory<PETScWrappers::Vector>;
-
-    template class VectorMemory<PETScWrappers::BlockVector>;
-    template class GrowingVectorMemory<PETScWrappers::BlockVector>;
-
-    template class VectorMemory<PETScWrappers::MPI::Vector>;
-    template class GrowingVectorMemory<PETScWrappers::MPI::Vector>;
-
-    template class VectorMemory<PETScWrappers::MPI::BlockVector>;
-    template class GrowingVectorMemory<PETScWrappers::MPI::BlockVector>;
-#endif
-
-#ifdef DEAL_II_USE_TRILINOS
-    template class VectorMemory<TrilinosWrappers::Vector>;
-    template class GrowingVectorMemory<TrilinosWrappers::Vector>;
-
-    template class VectorMemory<TrilinosWrappers::BlockVector>;
-    template class GrowingVectorMemory<TrilinosWrappers::BlockVector>;
-
-    template class VectorMemory<TrilinosWrappers::MPI::Vector>;
-    template class GrowingVectorMemory<TrilinosWrappers::MPI::Vector>;
-
-    template class VectorMemory<TrilinosWrappers::MPI::BlockVector>;
-    template class GrowingVectorMemory<TrilinosWrappers::MPI::BlockVector>;
-#endif
-
 DEAL_II_NAMESPACE_CLOSE
index 535a739a6c0ff7fc673bda28a94b6ae3a712f59f..39228c1fddbd4d51270e8e6297e1e18461f81f75 100644 (file)
@@ -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
 //---------------------------------------------------------------------------
 
 
-for (SCALAR : REAL_SCALARS)
+for (VECTOR : SERIAL_VECTORS)
   {
-    template class VectorMemory<Vector<SCALAR> >;
-    template class GrowingVectorMemory<Vector<SCALAR> >;
-
-    
-    template class VectorMemory<BlockVector<SCALAR> >;
-    template class GrowingVectorMemory<BlockVector<SCALAR> >;
-  }
-
-
-for (SCALAR : COMPLEX_SCALARS)
-  {
-    template class VectorMemory<Vector<SCALAR> >;
-    template class GrowingVectorMemory<Vector<SCALAR> >;
-    
-    template class VectorMemory<BlockVector<SCALAR> >;
-    template class GrowingVectorMemory<BlockVector<SCALAR> >;
+    template class VectorMemory<VECTOR>;
+    template class GrowingVectorMemory<VECTOR>;
   }
-

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.