From 26454356f8958bf077e8756471869dc0bb8e0af8 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 1 Oct 2020 13:57:34 +0200
Subject: [PATCH] tpp extraction

---
 container/FixedOrderedMultimap.h   | 56 +++---------------------
 container/FixedOrderedMultimap.tpp | 69 ++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 49 deletions(-)

diff --git a/container/FixedOrderedMultimap.h b/container/FixedOrderedMultimap.h
index 99825dc4..cb8ab10f 100644
--- a/container/FixedOrderedMultimap.h
+++ b/container/FixedOrderedMultimap.h
@@ -1,9 +1,8 @@
 #ifndef FSFW_CONTAINER_FIXEDORDEREDMULTIMAP_H_
 #define FSFW_CONTAINER_FIXEDORDEREDMULTIMAP_H_
 
-#include "../container/ArrayList.h"
+#include "ArrayList.h"
 #include <cstring>
-#include <set>
 
 /**
  * @brief   Map implementation which allows entries with identical keys
@@ -72,56 +71,15 @@ public:
      */
     ReturnValue_t exists(key_t key) const;
 
-    ReturnValue_t erase(Iterator *iter) {
-        uint32_t i;
-        if ((i = findFirstIndex((*iter).value->first)) >= _size) {
-            return KEY_DOES_NOT_EXIST;
-        }
-        removeFromPosition(i);
-        if (*iter != begin()) {
-            (*iter)--;
-        } else {
-            *iter = begin();
-        }
-        return HasReturnvaluesIF::RETURN_OK;
-    }
+    ReturnValue_t erase(Iterator *iter);
+    ReturnValue_t erase(key_t key);
 
-    ReturnValue_t erase(key_t key) {
-        uint32_t i;
-        if ((i = findFirstIndex(key)) >= _size) {
-            return KEY_DOES_NOT_EXIST;
-        }
-        do {
-            removeFromPosition(i);
-            i = findFirstIndex(key, i);
-        } while (i < _size);
-        return HasReturnvaluesIF::RETURN_OK;
-    }
+    Iterator find(key_t key) const;
+    ReturnValue_t find(key_t key, T **value) const;
 
-    Iterator find(key_t key) const {
-        ReturnValue_t result = exists(key);
-        if (result != HasReturnvaluesIF::RETURN_OK) {
-            return end();
-        }
-        return Iterator(&theMap[findFirstIndex(key)]);
-    }
+    void clear();
 
-    ReturnValue_t find(key_t key, T **value) const {
-        ReturnValue_t result = exists(key);
-        if (result != HasReturnvaluesIF::RETURN_OK) {
-            return result;
-        }
-        *value = &theMap[findFirstIndex(key)].second;
-        return HasReturnvaluesIF::RETURN_OK;
-    }
-
-    void clear() {
-        _size = 0;
-    }
-
-    size_t maxSize() const {
-        return theMap.maxSize();
-    }
+    size_t maxSize() const;
 
 private:
 	typedef KEY_COMPARE compare;
diff --git a/container/FixedOrderedMultimap.tpp b/container/FixedOrderedMultimap.tpp
index 5b7b9ead..bc76c594 100644
--- a/container/FixedOrderedMultimap.tpp
+++ b/container/FixedOrderedMultimap.tpp
@@ -71,4 +71,73 @@ inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::exists(
     return result;
 }
 
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(
+        Iterator *iter)
+{
+    uint32_t i;
+    if ((i = findFirstIndex((*iter).value->first)) >= _size) {
+        return KEY_DOES_NOT_EXIST;
+    }
+    removeFromPosition(i);
+    if (*iter != begin()) {
+        (*iter)--;
+    } else {
+        *iter = begin();
+    }
+    return HasReturnvaluesIF::RETURN_OK;
+}
+
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(
+        key_t key)
+{
+    uint32_t i;
+    if ((i = findFirstIndex(key)) >= _size) {
+        return KEY_DOES_NOT_EXIST;
+    }
+    do {
+        removeFromPosition(i);
+        i = findFirstIndex(key, i);
+    } while (i < _size);
+    return HasReturnvaluesIF::RETURN_OK;
+}
+
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(
+        key_t key, T **value) const
+{
+    ReturnValue_t result = exists(key);
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+        return result;
+    }
+    *value = &theMap[findFirstIndex(key)].second;
+    return HasReturnvaluesIF::RETURN_OK;
+}
+
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline typename FixedOrderedMultimap<key_t, T, KEY_COMPARE>::Iterator
+FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(
+        key_t key) const
+{
+    ReturnValue_t result = exists(key);
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+        return end();
+    }
+    return Iterator(&theMap[findFirstIndex(key)]);
+}
+
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline void FixedOrderedMultimap<key_t, T, KEY_COMPARE>::clear()
+{
+    _size = 0;
+}
+
+template<typename key_t, typename T, typename KEY_COMPARE>
+inline size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::maxSize() const
+{
+    return theMap.maxSize();
+}
+
+
 #endif /* FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_TPP_ */