fixup! [ui] Add support for a custom allocator to modm::ViewStack

modm-io · Jul 20, 2024 · 0d5bd59 · 0d5bd59
1 parent 667d67d
commit 0d5bd59
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/src/modm/ui/menu/abstract_menu.hpp b/src/modm/ui/menu/abstract_menu.hpp
@@ -30,7 +30,7 @@ namespace modm{
 	 * \author Thorsten Lajewski
 	 * \ingroup modm_ui_menu
 	 */
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class AbstractMenu : public AbstractView<Allocator>
 	{
 		public:

diff --git a/src/modm/ui/menu/abstract_view.hpp b/src/modm/ui/menu/abstract_view.hpp
@@ -18,7 +18,7 @@
 #ifndef MODM_ABSTRACT_VIEW_HPP
 #define MODM_ABSTRACT_VIEW_HPP
 
-#include <modm/utils/allocator.hpp>
+#include <memory>
 
 #include "iabstract_view.hpp"
 
@@ -36,7 +36,7 @@ namespace modm
 	 *\ingroup modm_ui_menu
 	 */
 
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class AbstractView : public IAbstractView
 	{
 		template<typename T>

diff --git a/src/modm/ui/menu/choice_menu.hpp b/src/modm/ui/menu/choice_menu.hpp
@@ -38,7 +38,7 @@ namespace modm{
 	 *    \ingroup modm_ui_menu
 	 *
 	 */
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class ChoiceMenu : public AbstractMenu<Allocator>
 	{
 	public:

diff --git a/src/modm/ui/menu/communicating_view.hpp b/src/modm/ui/menu/communicating_view.hpp
@@ -25,7 +25,7 @@
 namespace modm
 {
 	/// @ingroup modm_ui_menu
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class CommunicatingView : public xpcc::Communicatable
 	{
 	public:

diff --git a/src/modm/ui/menu/communicating_view_stack.hpp b/src/modm/ui/menu/communicating_view_stack.hpp
@@ -27,7 +27,7 @@
 namespace modm
 {
 	/// @ingroup modm_ui_menu
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class CommunicatingViewStack : public ViewStack<Allocator>
 	{
 	public:

diff --git a/src/modm/ui/menu/menu_entry_callback.hpp b/src/modm/ui/menu/menu_entry_callback.hpp
@@ -23,7 +23,7 @@
 namespace modm
 {
 	/// @ingroup modm_ui_menu
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class MenuEntryCallback
 	{
 	public:

diff --git a/src/modm/ui/menu/module.lb b/src/modm/ui/menu/module.lb
@@ -39,8 +39,7 @@ def prepare(module, options):
         ":communication:xpcc",
         ":container",
         ":processing:timer",
-        ":ui:display",
-        ":utils")
+        ":ui:display")
     return True
 
 def build(env):

diff --git a/src/modm/ui/menu/standard_menu.hpp b/src/modm/ui/menu/standard_menu.hpp
@@ -35,7 +35,7 @@ namespace modm
 	* \ingroup	modm_ui_menu
 	* \author	Thorsten Lajewski
 	*/
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	struct MenuEntry
 	{
 		/**
@@ -63,7 +63,7 @@ namespace modm
 	* \author	Thorsten Lajewski
 	*/
 
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class StandardMenu : public AbstractMenu<Allocator>
 	{
 	public:

diff --git a/src/modm/ui/menu/view_stack.hpp b/src/modm/ui/menu/view_stack.hpp
@@ -37,7 +37,7 @@ namespace modm
 	* \author	Thorsten Lajewski
 	*/
 
-	template<typename Allocator = allocator::Dynamic<IAbstractView> >
+	template<typename Allocator = std::allocator<IAbstractView> >
 	class ViewStack
 	{
 	public: