From 98af84c1455f57e96cf300a9746d759930e31f78 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 3 Jan 2021 14:41:54 +0100 Subject: [PATCH] additional tweask --- datapoollocal/LocalPoolVariable.h | 2 ++ datapoollocal/LocalPoolVariable.tpp | 2 ++ serialize/EndianConverter.h | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/datapoollocal/LocalPoolVariable.h b/datapoollocal/LocalPoolVariable.h index 7b7e443e..84be54b1 100644 --- a/datapoollocal/LocalPoolVariable.h +++ b/datapoollocal/LocalPoolVariable.h @@ -157,10 +157,12 @@ protected: */ ReturnValue_t commitWithoutLock() override; +#if FSFW_CPP_OSTREAM_ENABLED == 1 // std::ostream is the type for object std::cout template friend std::ostream& operator<< (std::ostream &out, const LocalPoolVariable &var); +#endif private: }; diff --git a/datapoollocal/LocalPoolVariable.tpp b/datapoollocal/LocalPoolVariable.tpp index aa5e5393..cd5117c8 100644 --- a/datapoollocal/LocalPoolVariable.tpp +++ b/datapoollocal/LocalPoolVariable.tpp @@ -106,12 +106,14 @@ inline ReturnValue_t LocalPoolVariable::deSerialize(const uint8_t** buffer, return SerializeAdapter::deSerialize(&value, buffer, size, streamEndianness); } +#if FSFW_CPP_OSTREAM_ENABLED == 1 template inline std::ostream& operator<< (std::ostream &out, const LocalPoolVariable &var) { out << var.value; return out; } +#endif template inline LocalPoolVariable::operator T() const { diff --git a/serialize/EndianConverter.h b/serialize/EndianConverter.h index c888a905..8f3c7a7e 100644 --- a/serialize/EndianConverter.h +++ b/serialize/EndianConverter.h @@ -3,7 +3,6 @@ #include "../osal/Endiness.h" #include -#include /** * Helper class to convert variables or bitstreams between machine