From: Daniel Arndt Date: Mon, 9 Oct 2017 12:49:13 +0000 (+0200) Subject: Move default pure virtual destructor of Function X-Git-Tag: v9.0.0-rc1~976^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5213%2Fhead;p=dealii.git Move default pure virtual destructor of Function --- diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h index e440f82fdb..95006ea1a1 100644 --- a/include/deal.II/base/function.h +++ b/include/deal.II/base/function.h @@ -850,6 +850,18 @@ private: }; +#ifndef DOXYGEN +// icc 2018 complains about an undefined reference +// if we put this in the templates.h file +// +// The destructor is pure virtual so we can't default it +// in the declaration. +template +inline +Function::~Function () = default; +#endif + + DEAL_II_NAMESPACE_CLOSE #endif diff --git a/include/deal.II/base/function.templates.h b/include/deal.II/base/function.templates.h index 3621675179..834884d872 100644 --- a/include/deal.II/base/function.templates.h +++ b/include/deal.II/base/function.templates.h @@ -46,13 +46,6 @@ Function::Function (const unsigned int n_components, -// The destructor is pure virtual so we can't default it -// in the declaration. -template -Function::~Function () = default; - - - template Function &Function::operator= (const Function &f) {