From: Martin Kronbichler Date: Mon, 9 Nov 2009 18:50:16 +0000 (+0000) Subject: Avoid double instantiations in case vector iterators are just plain pointers. X-Git-Tag: v8.0.0~6827 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=977f4186021e1e3250d5809c31c33c78fbf717fd;p=dealii.git Avoid double instantiations in case vector iterators are just plain pointers. git-svn-id: https://svn.dealii.org/trunk@20078 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/source/compressed_simple_sparsity_pattern.cc b/deal.II/lac/source/compressed_simple_sparsity_pattern.cc index 3eb0d5dfc1..f5b1d9f0cb 100644 --- a/deal.II/lac/source/compressed_simple_sparsity_pattern.cc +++ b/deal.II/lac/source/compressed_simple_sparsity_pattern.cc @@ -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::iterator, std::vector::iterator, const bool); - +#endif DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/compressed_sparsity_pattern.cc b/deal.II/lac/source/compressed_sparsity_pattern.cc index aa7b07e10f..4c1b3b8038 100644 --- a/deal.II/lac/source/compressed_sparsity_pattern.cc +++ b/deal.II/lac/source/compressed_sparsity_pattern.cc @@ -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::iterator, std::vector::iterator, const bool); +#endif DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/lac/source/sparsity_pattern.cc b/deal.II/lac/source/sparsity_pattern.cc index 09cdff5112..b14f516a5c 100644 --- a/deal.II/lac/source/sparsity_pattern.cc +++ b/deal.II/lac/source/sparsity_pattern.cc @@ -1162,11 +1162,13 @@ template void SparsityPattern::add_entries (const unsigned const unsigned int*, const unsigned int*, const bool); +#ifndef DEAL_II_VECTOR_ITERATOR_IS_POINTER template void SparsityPattern::add_entries::const_iterator> (const unsigned int, std::vector::const_iterator, std::vector::const_iterator, const bool); +#endif template void SparsityPattern::add_entries::iterator> (const unsigned int, std::vector::iterator,