Skip to content
Snippets Groups Projects
Commit 5f89f48c authored by oliver.sander_at_tu-dresden.de's avatar oliver.sander_at_tu-dresden.de
Browse files

Merge branch 'fix/dune_deprecated_macro' into 'master'

Replace DUNE_DEPRECATED by [[deprecated]]

See merge request !66
parents 23b5985b 03d066ea
No related branches found
No related tags found
1 merge request!66Replace DUNE_DEPRECATED by [[deprecated]]
Pipeline #46746 failed
...@@ -34,7 +34,7 @@ struct GenericVector ...@@ -34,7 +34,7 @@ struct GenericVector
//! Write vector to given stream //! Write vector to given stream
template <class VectorType> template <class VectorType>
DUNE_DEPRECATED_MSG("Please use Dune::MatrixVector::Generic::writeBinary instead.") [[deprecated("Please use Dune::MatrixVector::Generic::writeBinary instead.")]]
static void writeBinary(std::ostream& s, const VectorType& v) static void writeBinary(std::ostream& s, const VectorType& v)
{ {
Dune::MatrixVector::Generic::writeBinary(s, v); Dune::MatrixVector::Generic::writeBinary(s, v);
...@@ -42,7 +42,7 @@ struct GenericVector ...@@ -42,7 +42,7 @@ struct GenericVector
//! Read vector from a given stream //! Read vector from a given stream
template <class VectorType> template <class VectorType>
DUNE_DEPRECATED_MSG("Please use Dune::MatrixVector::Generic::readBinary instead.") [[deprecated("Please use Dune::MatrixVector::Generic::readBinary instead.")]]
static void readBinary(std::istream& s, VectorType& v) static void readBinary(std::istream& s, VectorType& v)
{ {
Dune::MatrixVector::Generic::readBinary(s, v); Dune::MatrixVector::Generic::readBinary(s, v);
...@@ -50,7 +50,7 @@ struct GenericVector ...@@ -50,7 +50,7 @@ struct GenericVector
//! Resize vector recursivly to size of given vector/matrix //! Resize vector recursivly to size of given vector/matrix
template <class VectorTypeA, class VectorTypeB> template <class VectorTypeA, class VectorTypeB>
DUNE_DEPRECATED_MSG("Please use Dune::MatrixVector::resize instead.") [[deprecated("Please use Dune::MatrixVector::resize instead.")]]
static void resize(VectorTypeA& a, const VectorTypeB& b) static void resize(VectorTypeA& a, const VectorTypeB& b)
{ {
Dune::MatrixVector::resize(a, b); Dune::MatrixVector::resize(a, b);
...@@ -58,7 +58,7 @@ struct GenericVector ...@@ -58,7 +58,7 @@ struct GenericVector
//! Set vector to zero at indices that are true in bitvector recursivly //! Set vector to zero at indices that are true in bitvector recursivly
template <class VectorType, class BitVectorType> template <class VectorType, class BitVectorType>
DUNE_DEPRECATED_MSG("Please use Dune::MatrixVector::Generic::truncate instead.") [[deprecated("Please use Dune::MatrixVector::Generic::truncate instead.")]]
static void truncate(VectorType& v, const BitVectorType& tr) static void truncate(VectorType& v, const BitVectorType& tr)
{ {
Dune::MatrixVector::Generic::truncate(v, tr); Dune::MatrixVector::Generic::truncate(v, tr);
......
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
virtual void nestedIteration(); virtual void nestedIteration();
//! Set the hasObstacle bitfield //! Set the hasObstacle bitfield
DUNE_DEPRECATED_MSG("Setting by raw pointer is deprecated. Use l-value or r-value or a shared_ptr") [[deprecated("Setting by raw pointer is deprecated. Use l-value or r-value or a shared_ptr")]]
void setHasObstacles(Dune::BitSetVector<dim>* hasObstacle) { void setHasObstacles(Dune::BitSetVector<dim>* hasObstacle) {
hasObstacle_ = Dune::stackobject_to_shared_ptr(*hasObstacle); hasObstacle_ = Dune::stackobject_to_shared_ptr(*hasObstacle);
} }
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
} }
//! Set the obstacle field //! Set the obstacle field
DUNE_DEPRECATED_MSG("Setting by raw pointer is deprecated. Use l-value or r-value or a shared_ptr") [[deprecated("Setting by raw pointer is deprecated. Use l-value or r-value or a shared_ptr")]]
void setObstacles(ObstacleVectorType* obstacles) { void setObstacles(ObstacleVectorType* obstacles) {
obstacles_ = Dune::stackobject_to_shared_ptr(*obstacles); obstacles_ = Dune::stackobject_to_shared_ptr(*obstacles);
} }
......
...@@ -95,7 +95,7 @@ namespace Dune { ...@@ -95,7 +95,7 @@ namespace Dune {
} }
template <class DerivedTransfer> template <class DerivedTransfer>
DUNE_DEPRECATED_MSG("Consider setting the transfer operators via smart pointers instead.") [[deprecated("Consider setting the transfer operators via smart pointers instead.")]]
void setTransferOperators(const std::vector<DerivedTransfer*>& transfer) void setTransferOperators(const std::vector<DerivedTransfer*>& transfer)
{ {
mgTransfer_.resize(transfer.size()); mgTransfer_.resize(transfer.size());
...@@ -153,7 +153,7 @@ namespace Dune { ...@@ -153,7 +153,7 @@ namespace Dune {
virtual void setMGType(int mu, int nu1, int nu2); virtual void setMGType(int mu, int nu1, int nu2);
/** \brief Set the smoother iteration step */ /** \brief Set the smoother iteration step */
DUNE_DEPRECATED_MSG("Consider setting the smoother via smart pointer, reference or temporaries instead.") [[deprecated("Consider setting the smoother via smart pointer, reference or temporaries instead.")]]
void setSmoother(LinearStepType* smoother) void setSmoother(LinearStepType* smoother)
{ {
presmootherDefault_ = postsmootherDefault_ = Dune::stackobject_to_shared_ptr(*smoother); presmootherDefault_ = postsmootherDefault_ = Dune::stackobject_to_shared_ptr(*smoother);
...@@ -171,7 +171,7 @@ namespace Dune { ...@@ -171,7 +171,7 @@ namespace Dune {
} }
/** \brief Set pre- and post smoothers individually */ /** \brief Set pre- and post smoothers individually */
DUNE_DEPRECATED_MSG("Consider setting the smoother via smart pointer, reference or temporaries instead.") [[deprecated("Consider setting the smoother via smart pointer, reference or temporaries instead.")]]
void setSmoother(LinearStepType* preSmoother, void setSmoother(LinearStepType* preSmoother,
LinearStepType* postSmoother) LinearStepType* postSmoother)
{ {
...@@ -190,7 +190,7 @@ namespace Dune { ...@@ -190,7 +190,7 @@ namespace Dune {
} }
/** \brief Set the smoother iteration step for a particular level */ /** \brief Set the smoother iteration step for a particular level */
DUNE_DEPRECATED_MSG("Consider setting the smoother via smart pointer, reference or temporaries instead.") [[deprecated("Consider setting the smoother via smart pointer, reference or temporaries instead.")]]
void setSmoother(LinearStepType* smoother, std::size_t level) void setSmoother(LinearStepType* smoother, std::size_t level)
{ {
levelWiseSmoothers_[level] = Dune::stackobject_to_shared_ptr(*smoother); levelWiseSmoothers_[level] = Dune::stackobject_to_shared_ptr(*smoother);
......
...@@ -94,7 +94,7 @@ namespace Solvers { ...@@ -94,7 +94,7 @@ namespace Solvers {
} }
// \brief Compute the squared norm for a given vector and matrix // \brief Compute the squared norm for a given vector and matrix
DUNE_DEPRECATED static field_type normSquared(const VectorType& u, [[deprecated]] static field_type normSquared(const VectorType& u,
const MatrixType& A, const MatrixType& A,
const field_type tol=1e-10) const field_type tol=1e-10)
{ {
......
...@@ -40,7 +40,7 @@ namespace Dune { ...@@ -40,7 +40,7 @@ namespace Dune {
{} {}
/** \brief Constructor taking all relevant data */ /** \brief Constructor taking all relevant data */
DUNE_DEPRECATED_MSG("Handing over raw pointer in the constructor is deprecated!") [[deprecated("Handing over raw pointer in the constructor is deprecated!")]]
IterativeSolver(int maxIterations, IterativeSolver(int maxIterations,
double tolerance, double tolerance,
const Norm<VectorType>* errorNorm, const Norm<VectorType>* errorNorm,
......
...@@ -32,7 +32,7 @@ class LoopSolver : public IterativeSolver<VectorType, BitVectorType> ...@@ -32,7 +32,7 @@ class LoopSolver : public IterativeSolver<VectorType, BitVectorType>
public: public:
/** \brief Constructor taking all relevant data */ /** \brief Constructor taking all relevant data */
DUNE_DEPRECATED_MSG("Handing over raw pointer in the constructor is deprecated!") [[deprecated("Handing over raw pointer in the constructor is deprecated!")]]
LoopSolver(IterationStep<VectorType, BitVectorType>* iterationStep, LoopSolver(IterationStep<VectorType, BitVectorType>* iterationStep,
int maxIterations, int maxIterations,
double tolerance, double tolerance,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment