From: Daniel Arndt Date: Mon, 15 May 2017 13:43:10 +0000 (+0200) Subject: Fixes for compiling with PGI X-Git-Tag: v9.0.0-rc1~1589^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4397%2Fhead;p=dealii.git Fixes for compiling with PGI --- diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index c685ef65a9..baac20c32d 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -1022,7 +1022,7 @@ namespace internal dealii::Tensor<2,dim,Number> convert_to_tensor (const dealii::SymmetricTensor<2,dim,Number> &s) { - Number t[dim][dim]; + dealii::Tensor<2,dim,Number> t; // diagonal entries are stored first for (unsigned int d=0; d(t); + return t; } diff --git a/source/base/utilities.cc b/source/base/utilities.cc index 8e58d34cd9..b53cd7e230 100644 --- a/source/base/utilities.cc +++ b/source/base/utilities.cc @@ -46,6 +46,10 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include +#if defined(DEAL_II_HAVE_UNISTD_H) && defined(DEAL_II_HAVE_GETHOSTNAME) +# include +#endif + #ifndef DEAL_II_MSVC # include #endif diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc index 73a767f36c..f569bbb85e 100644 --- a/source/grid/tria_accessor.cc +++ b/source/grid/tria_accessor.cc @@ -1,4 +1,4 @@ -// --------------------------------------------------------------------- +// --------------------------------------------------------------------- // // Copyright (C) 1998 - 2016 by the deal.II authors //