From: Wolfgang Bangerth Date: Wed, 18 Sep 2024 22:25:22 +0000 (-0600) Subject: Make sure the SmartPointer template remains accessible. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17714%2Fhead;p=dealii.git Make sure the SmartPointer template remains accessible. This needs to be so even if one includes the *new* file, as is done transitively throughtout the library, rather than including only the old file. --- diff --git a/include/deal.II/base/observer_pointer.h b/include/deal.II/base/observer_pointer.h index d030dab065..0dc7e4fe7c 100644 --- a/include/deal.II/base/observer_pointer.h +++ b/include/deal.II/base/observer_pointer.h @@ -272,6 +272,17 @@ private: }; +/** + * A type alias for the ObserverPointer class that makes sure the previous + * name of the class, SmartPointer, continues to be available. + * + * @deprecated Use the new name of the class, ObserverPointer, instead. + */ +template +using SmartPointer DEAL_II_DEPRECATED_EARLY_WITH_COMMENT( + "Use the new name of the class, ObserverPointer.") = ObserverPointer; + + /* --------------------- inline Template functions ------------------------- */ diff --git a/include/deal.II/base/smartpointer.h b/include/deal.II/base/smartpointer.h index 3865be68ce..ab4a6724bb 100644 --- a/include/deal.II/base/smartpointer.h +++ b/include/deal.II/base/smartpointer.h @@ -18,18 +18,10 @@ #include -DEAL_II_NAMESPACE_OPEN - -/** - * A type alias for the ObserverPointer class that makes sure the previous - * name of the class, SmartPointer, continues to be available. - * - * @deprecated Use the new name of the class, ObserverPointer, instead. - */ -template -using SmartPointer DEAL_II_DEPRECATED_EARLY_WITH_COMMENT( - "Use the new name of the class, ObserverPointer.") = ObserverPointer; - -DEAL_II_NAMESPACE_CLOSE +// This file is simply an alias for the base/observer_pointer.h file. +// The class was renamed and deprecated right after the 9.6 release. +// We should deprecate the file in the following release (9.7 or +// whatever release number it gets) and remove the release after +// (9.8 or as appropriate). #endif