From 9d47ed3ee4c33d4bd513b110a7f947952e958633 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Thu, 1 Jan 2015 12:48:38 +0100 Subject: [PATCH] Fix definition of syev method. Correct ifdef guard. This avoids compiler errors with clang 3.5. --- include/deal.II/lac/full_matrix.templates.h | 10 +++++----- include/deal.II/lac/lapack_templates.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/deal.II/lac/full_matrix.templates.h b/include/deal.II/lac/full_matrix.templates.h index 5b12d82212..baeb65f004 100644 --- a/include/deal.II/lac/full_matrix.templates.h +++ b/include/deal.II/lac/full_matrix.templates.h @@ -546,7 +546,7 @@ void FullMatrix::mmult (FullMatrix &dst, // see if we can use BLAS algorithms for this and if the type for 'number' // works for us (it is usually not efficient to use BLAS for very small // matrices): -#if DEAL_II_WITH_LAPACK +#ifdef DEAL_II_WITH_LAPACK if ((types_are_equal::value || types_are_equal::value) @@ -616,7 +616,7 @@ void FullMatrix::Tmmult (FullMatrix &dst, // see if we can use BLAS algorithms for this and if the type for 'number' // works for us (it is usually not efficient to use BLAS for very small // matrices): -#if DEAL_II_WITH_LAPACK +#ifdef DEAL_II_WITH_LAPACK if ((types_are_equal::value || types_are_equal::value) @@ -706,7 +706,7 @@ void FullMatrix::mTmult (FullMatrix &dst, // see if we can use BLAS algorithms for this and if the type for 'number' // works for us (it is usually not efficient to use BLAS for very small // matrices): -#if DEAL_II_WITH_LAPACK +#ifdef DEAL_II_WITH_LAPACK if ((types_are_equal::value || types_are_equal::value) @@ -794,7 +794,7 @@ void FullMatrix::TmTmult (FullMatrix &dst, // see if we can use BLAS algorithms for this and if the type for 'number' // works for us (it is usually not efficient to use BLAS for very small // matrices): -#if DEAL_II_WITH_LAPACK +#ifdef DEAL_II_WITH_LAPACK if ((types_are_equal::value || types_are_equal::value) @@ -1713,7 +1713,7 @@ FullMatrix::gauss_jordan () // works for us (it is usually not // efficient to use Lapack for very small // matrices): -#if DEAL_II_WITH_LAPACK +#ifdef DEAL_II_WITH_LAPACK if (types_are_equal::value || types_are_equal::value) diff --git a/include/deal.II/lac/lapack_templates.h b/include/deal.II/lac/lapack_templates.h index 2762c7da65..ca89ec0695 100644 --- a/include/deal.II/lac/lapack_templates.h +++ b/include/deal.II/lac/lapack_templates.h @@ -719,7 +719,7 @@ syev (const char *, const char *, const int *, number1 *, const int *, number2 * inline void syev (const char *jobz, const char *uplo, const int *n, double *A, const int *lda, double *w, double *work, const int *lwork, int *info) { - dsyev_ (char *jobz,char *uplo,int *n,double*A,int *lda,double*w,double*work,int *lwork,int *info); + dsyev_ (jobz,uplo,n,A,lda,w,work,lwork,info); } #else inline void @@ -734,7 +734,7 @@ syev (const char *, const char *, const int *, double *, const int *, double *, inline void syev (const char *jobz, const char *uplo, const int *n, float *A, const int *lda, float *w, float *work, const int *lwork, int *info) { - ssyev_ (char *jobz,char *uplo,int *n,double*A,int *lda,double*w,double*work,int *lwork,int *info); + ssyev_ (jobz,uplo,n,A,lda,w,work,lwork,info); } #else inline void -- 2.39.5