From c7ab5de64a56584a56f9ce59a76ac2793d8bec0c Mon Sep 17 00:00:00 2001 From: Tobias Leibner <tobias.leibner@googlemail.com> Date: Wed, 26 Nov 2014 14:05:13 +0100 Subject: [PATCH] [playground.spaces] move deprecated classes to deprecated headers, refs #14 --- .../spaces/cg/fem-localfunctions.hh | 18 ------------------ .../continuouslagrange/fem-localfunctions.hh | 19 +++++++++++++++++++ .../spaces/dg/fem-localfunctions.hh | 18 ------------------ .../fem-localfunctions.hh | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/dune/gdt/playground/spaces/cg/fem-localfunctions.hh b/dune/gdt/playground/spaces/cg/fem-localfunctions.hh index 89479f01e..898b47dc6 100644 --- a/dune/gdt/playground/spaces/cg/fem-localfunctions.hh +++ b/dune/gdt/playground/spaces/cg/fem-localfunctions.hh @@ -238,24 +238,6 @@ class FemLocalfunctionsBased } // namespace CG -namespace ContinuousLagrange { - - -template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> -class DUNE_DEPRECATED_MSG("Use CG::FemLocalfunctionsBased instead (21.11.2014)!") FemLocalfunctionsBased - : public CG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> -{ -public: - template <class... Args> - FemLocalfunctionsBased(Args&&... args) - : CG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>( - std::forward<Args>(args)...) - { - } -}; - - -} // namespace ContinuousLagrange } // namespace Spaces } // namespace GDT } // namespace Dune diff --git a/dune/gdt/playground/spaces/continuouslagrange/fem-localfunctions.hh b/dune/gdt/playground/spaces/continuouslagrange/fem-localfunctions.hh index bb8e9ae21..d04ac5581 100644 --- a/dune/gdt/playground/spaces/continuouslagrange/fem-localfunctions.hh +++ b/dune/gdt/playground/spaces/continuouslagrange/fem-localfunctions.hh @@ -9,4 +9,23 @@ #warning This header is deprecated, include <dune/gdt/playground/spaces/cg/fem-localfunctions.hh> instead (21.11.2014)! #include <dune/gdt/playground/spaces/cg/fem-localfunctions.hh> +namespace ContinuousLagrange { + + +template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> +class DUNE_DEPRECATED_MSG("Use CG::FemLocalfunctionsBased instead (21.11.2014)!") FemLocalfunctionsBased + : public CG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> +{ +public: + template <class... Args> + FemLocalfunctionsBased(Args&&... args) + : CG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>( + std::forward<Args>(args)...) + { + } +}; + + +} // namespace ContinuousLagrange + #endif // DUNE_GDT_PLAYGROUND_SPACES_CONTINUOUSLAGRANGE_FEM_LOCALFUNCTIONS_HH diff --git a/dune/gdt/playground/spaces/dg/fem-localfunctions.hh b/dune/gdt/playground/spaces/dg/fem-localfunctions.hh index 92b8d7390..e84561d98 100644 --- a/dune/gdt/playground/spaces/dg/fem-localfunctions.hh +++ b/dune/gdt/playground/spaces/dg/fem-localfunctions.hh @@ -229,24 +229,6 @@ class FemLocalfunctionsBased } // namespace DG -namespace DiscontinuousLagrange { - - -template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> -class DUNE_DEPRECATED_MSG("Use DG::FemLocalfunctionsBased instead (21.11.2014)!") FemLocalfunctionsBased - : public DG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> -{ -public: - template <class... Args> - FemLocalfunctionsBased(Args&&... args) - : DG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>( - std::forward<Args>(args)...) - { - } -}; - - -} // namespace DiscontinuousLagrange } // namespace Spaces } // namespace GDT } // namespace Dune diff --git a/dune/gdt/playground/spaces/discontinuouslagrange/fem-localfunctions.hh b/dune/gdt/playground/spaces/discontinuouslagrange/fem-localfunctions.hh index 54005f718..2340edee7 100644 --- a/dune/gdt/playground/spaces/discontinuouslagrange/fem-localfunctions.hh +++ b/dune/gdt/playground/spaces/discontinuouslagrange/fem-localfunctions.hh @@ -9,4 +9,23 @@ #warning This header is deprecated, include <dune/gdt/playground/spaces/dg/fem-localfunctions.hh> instead (21.11.2014)! #include <dune/gdt/playground/spaces/dg/fem-localfunctions.hh> +namespace DiscontinuousLagrange { + + +template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> +class DUNE_DEPRECATED_MSG("Use DG::FemLocalfunctionsBased instead (21.11.2014)!") FemLocalfunctionsBased + : public DG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> +{ +public: + template <class... Args> + FemLocalfunctionsBased(Args&&... args) + : DG::FemLocalfunctionsBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>( + std::forward<Args>(args)...) + { + } +}; + + +} // namespace DiscontinuousLagrange + #endif // DUNE_GDT_PLAYGROUND_SPACES_DISCONTINUOUSLAGRANGE_FEM_LOCALFUNCTIONS_HH -- GitLab