]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix some compilation errors with clang. 1055/head
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 29 Jun 2015 14:41:42 +0000 (09:41 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 29 Jun 2015 14:41:42 +0000 (09:41 -0500)
Specifically, address these: http://cdash.kyomu.43-1.org/testDetails.php?test=15565167&build=9452

include/deal.II/lac/block_matrix_array.h
include/deal.II/lac/pointer_matrix.h

index 74054bdda9e3c3c06f595b2d5f617a7ea469d6ca..e55eb2b33c7cf3decff3f227ee5735ff556db68a 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -22,6 +22,7 @@
 
 #include <deal.II/lac/pointer_matrix.h>
 #include <deal.II/lac/vector_memory.h>
+#include <deal.II/lac/block_vector.h>
 
 #include <vector>
 #include <map>
index 6181ca95e9052979a318a4572f902c03cca840f4..628af604f242ae49609612cad5636c02e2634339 100644 (file)
@@ -548,7 +548,7 @@ new_pointer_matrix_base(const BlockSparseMatrixEZ<numberm> &matrix, const VECTOR
  *
  * @relates PointerMatrixBase @relates PointerMatrix
  */
-template <typename numberv, typename numberm, typename BLOCK_VECTOR=BlockVector<numberv> >
+template <typename numberv, typename numberm, typename BLOCK_VECTOR>
 PointerMatrixBase<BLOCK_VECTOR> *
 new_pointer_matrix_base(const BlockMatrixArray<numberm,BLOCK_VECTOR> &matrix, const BLOCK_VECTOR &, const char *name = "PointerMatrix")
 {

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.