From 46c7d997dd82d880b956a73a65953f09e3f9924f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Jun 2015 09:41:42 -0500 Subject: [PATCH] Fix some compilation errors with clang. Specifically, address these: http://cdash.kyomu.43-1.org/testDetails.php?test=15565167&build=9452 --- include/deal.II/lac/block_matrix_array.h | 3 ++- include/deal.II/lac/pointer_matrix.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/deal.II/lac/block_matrix_array.h b/include/deal.II/lac/block_matrix_array.h index 74054bdda9..e55eb2b33c 100644 --- a/include/deal.II/lac/block_matrix_array.h +++ b/include/deal.II/lac/block_matrix_array.h @@ -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 #include +#include #include #include diff --git a/include/deal.II/lac/pointer_matrix.h b/include/deal.II/lac/pointer_matrix.h index 6181ca95e9..628af604f2 100644 --- a/include/deal.II/lac/pointer_matrix.h +++ b/include/deal.II/lac/pointer_matrix.h @@ -548,7 +548,7 @@ new_pointer_matrix_base(const BlockSparseMatrixEZ &matrix, const VECTOR * * @relates PointerMatrixBase @relates PointerMatrix */ -template > +template PointerMatrixBase * new_pointer_matrix_base(const BlockMatrixArray &matrix, const BLOCK_VECTOR &, const char *name = "PointerMatrix") { -- 2.39.5