]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Avoid double instantiations in case vector iterators are just plain pointers.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 9 Nov 2009 18:50:16 +0000 (18:50 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Mon, 9 Nov 2009 18:50:16 +0000 (18:50 +0000)
git-svn-id: https://svn.dealii.org/trunk@20078 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/source/compressed_simple_sparsity_pattern.cc
deal.II/lac/source/compressed_sparsity_pattern.cc
deal.II/lac/source/sparsity_pattern.cc

index 3eb0d5dfc10bce6abe9c384114840263983a3982..f5b1d9f0cb1546a83e3ab17bce05c7333036d707 100644 (file)
@@ -422,10 +422,11 @@ CompressedSimpleSparsityPattern::n_nonzero_elements () const
 template void CompressedSimpleSparsityPattern::Line::add_entries(unsigned int *,
                                                                 unsigned int *,
                                                                 const bool);
+#ifndef DEAL_II_VECTOR_ITERATOR_IS_POINTER
 template void CompressedSimpleSparsityPattern::Line::
 add_entries(std::vector<unsigned int>::iterator,
            std::vector<unsigned int>::iterator,
            const bool);
-
+#endif
 
 DEAL_II_NAMESPACE_CLOSE
index aa7b07e10fdf852f154c13b40b23a28a0e189035..4c1b3b8038fe912d1a7a7169a1dc481d6938ff9f 100644 (file)
@@ -548,9 +548,11 @@ CompressedSparsityPattern::n_nonzero_elements () const
 template void CompressedSparsityPattern::Line::add_entries(unsigned int *,
                                                           unsigned int *,
                                                           const bool);
+#ifndef DEAL_II_VECTOR_ITERATOR_IS_POINTER
 template void CompressedSparsityPattern::Line::
 add_entries(std::vector<unsigned int>::iterator,
            std::vector<unsigned int>::iterator,
            const bool);
+#endif
 
 DEAL_II_NAMESPACE_CLOSE
index 09cdff51120ba33bda2894c71032169599fa38dd..b14f516a5c9d15d657b27ec43f8f79c571b54917 100644 (file)
@@ -1162,11 +1162,13 @@ template void SparsityPattern::add_entries<const unsigned int*> (const unsigned
                                                                 const unsigned int*,
                                                                 const unsigned int*,
                                                                 const bool);
+#ifndef DEAL_II_VECTOR_ITERATOR_IS_POINTER
 template void SparsityPattern::add_entries<std::vector<unsigned int>::const_iterator> 
 (const unsigned int,
  std::vector<unsigned int>::const_iterator,
  std::vector<unsigned int>::const_iterator,
  const bool);
+#endif
 template void SparsityPattern::add_entries<std::vector<unsigned int>::iterator> 
 (const unsigned int,
  std::vector<unsigned int>::iterator,

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.