From 7d12181b66b89f606d90355b08f2aab57be26244 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 9 Oct 2017 14:49:13 +0200 Subject: [PATCH] Move default pure virtual destructor of Function --- include/deal.II/base/function.h | 12 ++++++++++++ include/deal.II/base/function.templates.h | 7 ------- 2 files changed, 12 insertions(+), 7 deletions(-) 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) { -- 2.39.5