Skip to content
Snippets Groups Projects
Unverified Commit 8e26106f authored by Ansgar Burchardt's avatar Ansgar Burchardt
Browse files

cgstep.hh: include cgstep.cc outside namespace block

The `#include` directives in cgstep.cc otherwise result in definitions
in the wrong namespace.
parent 14b20ebd
Branches
No related tags found
1 merge request!29CGStep: hold preconditioner in a `shared_ptr`
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include <dune/solvers/common/canignore.hh> #include <dune/solvers/common/canignore.hh>
#include <dune/matrix-vector/genericvectortools.hh> #include <dune/matrix-vector/genericvectortools.hh>
namespace Dune {
namespace Solvers {
template <class MatrixType, class VectorType, class Ignore> template <class MatrixType, class VectorType, class Ignore>
void CGStep<MatrixType, VectorType, Ignore>::check() const void CGStep<MatrixType, VectorType, Ignore>::check() const
{ {
...@@ -59,3 +62,6 @@ void CGStep<MatrixType, VectorType, Ignore>::iterate() ...@@ -59,3 +62,6 @@ void CGStep<MatrixType, VectorType, Ignore>::iterate()
p_ += q; p_ += q;
r_squared_old_ = r_squared; r_squared_old_ = r_squared;
} }
} /* namespace Solvers */
} /* namespace Dune */
...@@ -60,9 +60,9 @@ namespace Dune { ...@@ -60,9 +60,9 @@ namespace Dune {
Preconditioner* preconditioner_; Preconditioner* preconditioner_;
}; };
#include "cgstep.cc"
} }
} }
#include "cgstep.cc"
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment