[utils] Deprecate allocator::Dynamic for std::allocator

modm-io · Jul 19, 2024 · 098fbda · 098fbda
1 parent 5f15719
commit 098fbda
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/src/modm/communication/rpr/interface.hpp b/src/modm/communication/rpr/interface.hpp
@@ -18,7 +18,7 @@
 #include <modm/architecture/utils.hpp>
 #include <modm/container/queue.hpp>
 #include <modm/processing/timer.hpp>
-#include <modm/utils/allocator/dynamic.hpp>
+#include <memory>
 
 #include "constants.hpp"
 
@@ -123,7 +123,7 @@ namespace modm
 			static Queue messagesToSend;
 			static Queue receivedMessages;
 
-			static modm::allocator::Dynamic<uint8_t> bufferAllocator;
+			static std::allocator<uint8_t> bufferAllocator;
 
 			static Message receiveBuffer;
 			static uint8_t rx_buffer[N+8];

diff --git a/src/modm/container/doubly_linked_list.hpp b/src/modm/container/doubly_linked_list.hpp
@@ -17,7 +17,7 @@
 #define	MODM_DOUBLY_LINKED_LIST_HPP
 
 #include <stdint.h>
-#include <modm/utils/allocator.hpp>
+#include <memory>
 #include <iterator>
 
 namespace modm
@@ -30,7 +30,7 @@ namespace modm
 	 * \author	Fabian Greif
 	 * \ingroup	modm_container
 	 */
-	template <typename T, typename Allocator = allocator::Dynamic<T> >
+	template <typename T, typename Allocator = std::allocator<T> >
 	class DoublyLinkedList
 	{
 	public:

diff --git a/src/modm/container/dynamic_array.hpp b/src/modm/container/dynamic_array.hpp
@@ -17,7 +17,7 @@
 #define MODM_DYNAMIC_ARRAY_HPP
 
 #include <cstddef>
-#include <modm/utils/allocator.hpp>
+#include <memory>
 #include <initializer_list>
 #include <iterator>
 
@@ -44,7 +44,7 @@ namespace modm
 	 * \author	Fabian Greif <[email protected]>
 	 * \ingroup	modm_container
 	 */
-	template <typename T, typename Allocator = allocator::Dynamic<T> >
+	template <typename T, typename Allocator = std::allocator<T> >
 	class DynamicArray
 	{
 	public:

diff --git a/src/modm/container/linked_list.hpp b/src/modm/container/linked_list.hpp
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 #include <iterator>
-#include <modm/utils/allocator.hpp>
+#include <memory>
 
 namespace modm
 {
@@ -29,13 +29,12 @@ namespace modm
 	 * \todo	implementation
 	 *
 	 * \tparam	T			Type of list entries
-	 * \tparam	Allocator	Allocator used for memory allocation. See
-	 * 						classes from modm::allocator namespace.
+	 * \tparam	Allocator	Allocator used for memory allocation.
 	 *
 	 * \author	Fabian Greif
 	 * \ingroup	modm_container
 	 */
-	template <typename T, typename Allocator = allocator::Dynamic<T> >
+	template <typename T, typename Allocator = std::allocator<T> >
 	class LinkedList
 	{
 	public:

diff --git a/src/modm/container/module.lb b/src/modm/container/module.lb
@@ -20,8 +20,7 @@ def init(module):
 def prepare(module, options):
     module.depends(
         ":architecture",
-        ":io",
-        ":utils")
+        ":io")
     return True
 
 

diff --git a/src/modm/utils/allocator.hpp b/src/modm/utils/allocator.hpp
@@ -19,12 +19,14 @@
 namespace modm::allocator
 {
 
+// DEPRECATED: 2025q3
 /**
  * Base class for all allocator types
  *
  * @ingroup modm_utils
  * @author  Fabian Greif
  */
+[[deprecated("Please use std::allocator<T> instead!")]]
 template <typename T>
 class AllocatorBase
 {
@@ -66,6 +68,7 @@ class AllocatorBase
     }
 };
 
+// DEPRECATED: 2025q3
 /**
  * Dynamic memory allocator
  *
@@ -75,6 +78,7 @@ class AllocatorBase
  * @ingroup modm_utils
  * @author  Fabian Greif
  */
+[[deprecated("Please use std::allocator<T> instead!")]]
 template <typename T>
 class Dynamic : public AllocatorBase<T>
 {