From 695a767164573b73a3360e9bf10a70773236ef2c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 3 Jan 2021 14:33:17 +0100
Subject: [PATCH] some include fixes

---
 globalfunctions/arrayprinter.cpp          | 2 +-
 objectmanager/ObjectManager.cpp           | 2 +-
 serviceinterface/ServiceInterfaceStream.h | 1 +
 storagemanager/ConstStorageAccessor.cpp   | 2 ++
 storagemanager/StorageAccessor.cpp        | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/globalfunctions/arrayprinter.cpp b/globalfunctions/arrayprinter.cpp
index d0b0a3bf..c273b250 100644
--- a/globalfunctions/arrayprinter.cpp
+++ b/globalfunctions/arrayprinter.cpp
@@ -33,7 +33,7 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
 				sif::info << std::endl;
 
 			}
-
+		}
 	}
 	sif::info << std::dec;
 	sif::info << "]" << std::endl;
diff --git a/objectmanager/ObjectManager.cpp b/objectmanager/ObjectManager.cpp
index 69dd905b..882d2762 100644
--- a/objectmanager/ObjectManager.cpp
+++ b/objectmanager/ObjectManager.cpp
@@ -29,7 +29,7 @@ ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) {
 	} else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 		sif::error << "ObjectManager::insert: Object id " << std::hex
-		           << static_cast<uint32_t> id << std::dec
+		           << static_cast<uint32_t>(id) << std::dec
 				   << " is already in use!" << std::endl;
 		sif::error << "Terminating program." << std::endl;
 #endif
diff --git a/serviceinterface/ServiceInterfaceStream.h b/serviceinterface/ServiceInterfaceStream.h
index c18c6c2e..f3cb2cd0 100644
--- a/serviceinterface/ServiceInterfaceStream.h
+++ b/serviceinterface/ServiceInterfaceStream.h
@@ -2,6 +2,7 @@
 #define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_
 
 #include "ServiceInterfaceBuffer.h"
+#include <FSFWConfig.h>
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 
diff --git a/storagemanager/ConstStorageAccessor.cpp b/storagemanager/ConstStorageAccessor.cpp
index 39530ac9..aab84862 100644
--- a/storagemanager/ConstStorageAccessor.cpp
+++ b/storagemanager/ConstStorageAccessor.cpp
@@ -4,6 +4,8 @@
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../globalfunctions/arrayprinter.h"
 
+#include <algorithm>
+
 ConstStorageAccessor::ConstStorageAccessor(store_address_t storeId):
 		storeId(storeId) {}
 
diff --git a/storagemanager/StorageAccessor.cpp b/storagemanager/StorageAccessor.cpp
index fec5d75e..a7b4fae4 100644
--- a/storagemanager/StorageAccessor.cpp
+++ b/storagemanager/StorageAccessor.cpp
@@ -2,6 +2,8 @@
 #include "StorageManagerIF.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
 
+#include <algorithm>
+
 StorageAccessor::StorageAccessor(store_address_t storeId):
 		ConstStorageAccessor(storeId) {
 }