From ed80768c66335e7404e905a94db33ae0e0cc2f78 Mon Sep 17 00:00:00 2001
From: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>
Date: Tue, 22 Sep 2020 16:13:45 +0200
Subject: [PATCH 1/2] Fixes #194

---
 container/ArrayList.h            | 5 ++---
 container/FixedOrderedMultimap.h | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/container/ArrayList.h b/container/ArrayList.h
index be89761ec..37df6d546 100644
--- a/container/ArrayList.h
+++ b/container/ArrayList.h
@@ -95,10 +95,9 @@ public:
 
 		//SHOULDDO this should be implemented as non-member
 		bool operator!=(const typename ArrayList<T, count_t>::Iterator& other) const {
-			return !(*this == other);
+			return !(*this ==other);
 		}
-	}
-	;
+	};
 
 	/**
 	 * Number of Elements stored in this List
diff --git a/container/FixedOrderedMultimap.h b/container/FixedOrderedMultimap.h
index 31282f804..c5fd2184b 100644
--- a/container/FixedOrderedMultimap.h
+++ b/container/FixedOrderedMultimap.h
@@ -10,10 +10,9 @@
 template<typename key_t, typename T, typename KEY_COMPARE = std::less<key_t>>
 class FixedOrderedMultimap {
 public:
-	static const uint8_t INTERFACE_ID = CLASS_ID::FIXED_MAP;
-	static const ReturnValue_t KEY_ALREADY_EXISTS = MAKE_RETURN_CODE(0x01);
-	static const ReturnValue_t MAP_FULL = MAKE_RETURN_CODE(0x02);
-	static const ReturnValue_t KEY_DOES_NOT_EXIST = MAKE_RETURN_CODE(0x03);
+	static const uint8_t INTERFACE_ID = CLASS_ID::FIXED_MULTIMAP;
+	static const ReturnValue_t MAP_FULL = MAKE_RETURN_CODE(0x01);
+	static const ReturnValue_t KEY_DOES_NOT_EXIST = MAKE_RETURN_CODE(0x02);
 
 private:
 	typedef KEY_COMPARE compare;

From 74a4c98ca73b25de31e2ec678aeb9aff5f900e96 Mon Sep 17 00:00:00 2001
From: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>
Date: Tue, 22 Sep 2020 16:23:35 +0200
Subject: [PATCH 2/2] Small format stuff

---
 container/ArrayList.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container/ArrayList.h b/container/ArrayList.h
index 37df6d546..19454777b 100644
--- a/container/ArrayList.h
+++ b/container/ArrayList.h
@@ -95,7 +95,7 @@ public:
 
 		//SHOULDDO this should be implemented as non-member
 		bool operator!=(const typename ArrayList<T, count_t>::Iterator& other) const {
-			return !(*this ==other);
+			return !(*this == other);
 		}
 	};