From 5f76b03f3ab29b5f401124ad2a0a137a6828d285 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 7 Jul 2020 17:44:15 +0200
Subject: [PATCH] fifo tweaks

---
 container/DynamicFIFO.h | 27 +++++++++++++++++++++++++++
 container/FIFO.h        | 23 +++++++++--------------
 container/FIFOBase.h    |  4 ----
 container/StaticFIFO.h  | 30 ------------------------------
 4 files changed, 36 insertions(+), 48 deletions(-)
 create mode 100644 container/DynamicFIFO.h
 delete mode 100644 container/StaticFIFO.h

diff --git a/container/DynamicFIFO.h b/container/DynamicFIFO.h
new file mode 100644
index 000000000..3a5242c7e
--- /dev/null
+++ b/container/DynamicFIFO.h
@@ -0,0 +1,27 @@
+#ifndef FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
+#define FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
+
+#include <framework/container/FIFOBase.h>
+#include <vector>
+
+/**
+ * @brief 	Simple First-In-First-Out data structure. The maximum size
+ * 			can be set in the constructor.
+ * @details
+ * The maximum capacity can be determined at run-time, so this container
+ * performs dynamic memory allocation!
+ * The public interface of FIFOBase exposes the user interface for the FIFO.
+ * @tparam T Entry Type
+ * @tparam capacity Maximum capacity
+ */
+template<typename T>
+class DynamicFIFO: public FIFOBase<T> {
+public:
+	DynamicFIFO(size_t maxCapacity): FIFOBase<T>(values.data(), maxCapacity),
+			values(maxCapacity) {};
+
+private:
+	std::vector<T> values;
+};
+
+#endif /* FRAMEWORK_CONTAINER_DYNAMICFIFO_H_ */
diff --git a/container/FIFO.h b/container/FIFO.h
index 19daaf1be..ecb218fda 100644
--- a/container/FIFO.h
+++ b/container/FIFO.h
@@ -1,31 +1,26 @@
 #ifndef FRAMEWORK_CONTAINER_FIFO_H_
 #define FRAMEWORK_CONTAINER_FIFO_H_
 
+#include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/container/FIFOBase.h>
-#include <vector>
-
-namespace fsfw {
+#include <array>
 
 /**
- * @brief 	Simple First-In-First-Out data structure. The maximum size
- * 			can be set in the constructor.
+ * @brief 	Simple First-In-First-Out data structure with size fixed at
+ * 			compile time
  * @details
- * The maximum capacity can be determined at run-time, so this container
- * performs dynamic memory allocation!
+ * Performs no dynamic memory allocation.
  * The public interface of FIFOBase exposes the user interface for the FIFO.
  * @tparam T Entry Type
  * @tparam capacity Maximum capacity
  */
-template<typename T>
+template<typename T, size_t capacity>
 class FIFO: public FIFOBase<T> {
 public:
-	FIFO(size_t maxCapacity): FIFOBase<T>(values.data(), maxCapacity),
-			values(maxCapacity) {};
+	FIFO(): FIFOBase<T>(values.data(), capacity) {};
 
 private:
-	std::vector<T> values;
+	std::array<T, capacity> values;
 };
 
-}
-
-#endif /* FRAMEWORK_CONTAINER_FIFO_H_ */
+#endif /* FRAMEWORK_CONTAINERS_STATICFIFO_H_ */
diff --git a/container/FIFOBase.h b/container/FIFOBase.h
index 6ed7d924b..8bdb333f8 100644
--- a/container/FIFOBase.h
+++ b/container/FIFOBase.h
@@ -4,8 +4,6 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <cstddef>
 
-namespace fsfw {
-
 template <typename T>
 class FIFOBase {
 public:
@@ -60,6 +58,4 @@ private:
 
 #include <framework/container/FIFOBase.tpp>
 
-}
-
 #endif /* FRAMEWORK_CONTAINER_FIFOBASE_H_ */
diff --git a/container/StaticFIFO.h b/container/StaticFIFO.h
deleted file mode 100644
index f31282004..000000000
--- a/container/StaticFIFO.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef FRAMEWORK_CONTAINER_STATICFIFO_H_
-#define FRAMEWORK_CONTAINER_STATICFIFO_H_
-
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/container/FIFOBase.h>
-#include <array>
-
-namespace fsfw {
-
-/**
- * @brief 	Simple First-In-First-Out data structure with size fixed at
- * 			compile time
- * @details
- * Performs no dynamic memory allocation.
- * The public interface of FIFOBase exposes the user interface for the FIFO.
- * @tparam T Entry Type
- * @tparam capacity Maximum capacity
- */
-template<typename T, size_t capacity>
-class StaticFIFO: public FIFOBase<T> {
-public:
-	StaticFIFO(): FIFOBase<T>(values.data(), capacity) {};
-
-private:
-	std::array<T, capacity> values;
-};
-
-}
-
-#endif /* FRAMEWORK_CONTAINERS_STATICFIFO_H_ */