From 57aeee0bc6198273c41a0011e1a5404ade0aaaaf Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Thu, 19 Apr 2012 09:56:29 +0000 Subject: [PATCH] Merge definition and declaration A separate definition inside the header leads to duplicate symbols if two files that include the header are linked. [[Imported from SVN: r6065]] --- dune/solvers/solvers/solver.hh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dune/solvers/solvers/solver.hh b/dune/solvers/solvers/solver.hh index 28aff314..caa6dd80 100644 --- a/dune/solvers/solvers/solver.hh +++ b/dune/solvers/solvers/solver.hh @@ -15,17 +15,14 @@ virtual ~Solver() {} /** \brief Do the necessary preprocessing */ - virtual void preprocess(); + virtual void preprocess() + { + // Default: Do nothing + } /** \brief Derived classes overload this with the actual * solution algorithm */ virtual void solve() = 0; }; - -void Solver::preprocess() -{ - // Default: Do nothing -} - #endif -- GitLab