eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

exlcuding ostream headers

Browse Source
This commit is contained in:
Robin Müller 2021-01-03 14:08:40 +01:00
parent afda3b2fa0
commit 4515c0d3cd
7 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
datapool/PoolEntry.cpp
View File

@ -3,6 +3,7 @@
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../globalfunctions/arrayprinter.h" #include "../globalfunctions/arrayprinter.h"
#include <cstring> #include <cstring>
#include <algorithm>
template <typename T> template <typename T>
PoolEntry<T>::PoolEntry(std::initializer_list<T> initValue, uint8_t setLength, PoolEntry<T>::PoolEntry(std::initializer_list<T> initValue, uint8_t setLength,

2
health/HealthTableIF.h
View File

@ -5,6 +5,8 @@
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
#include <utility>
class HealthTableIF: public ManagesHealthIF { class HealthTableIF: public ManagesHealthIF {
public: public:
virtual ~HealthTableIF() {} virtual ~HealthTableIF() {}

3
objectmanager/ObjectManager.cpp
View File

@ -1,6 +1,9 @@
#include "ObjectManager.h" #include "ObjectManager.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#if CPP_OSTREAM_ENABLED == 1
#include <iomanip> #include <iomanip>
#endif
#include <cstdlib> #include <cstdlib>
ObjectManager::ObjectManager( void (*setProducer)() ): ObjectManager::ObjectManager( void (*setProducer)() ):

9
serviceinterface/ServiceInterfaceBuffer.cpp
View File

@ -1,7 +1,10 @@
#include "../timemanager/Clock.h"
#include "ServiceInterfaceBuffer.h" #include "ServiceInterfaceBuffer.h"
#if CPP_OSTREAM_ENABLED == 1
#include "../timemanager/Clock.h"
#include "serviceInterfaceDefintions.h" #include "serviceInterfaceDefintions.h"
#include <FSFWConfig.h>
#include <cstring> #include <cstring>
#include <inttypes.h> #include <inttypes.h>
@ -252,3 +255,5 @@ void ServiceInterfaceBuffer::initSocket() {
} }
#endif //ML505 #endif //ML505
#endif /* CPP_OSTREAM_ENABLED == 1 */

4
serviceinterface/ServiceInterfaceBuffer.h
View File

@ -3,6 +3,9 @@
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
#include <FSFWConfig.h> #include <FSFWConfig.h>
#if CPP_OSTREAM_ENABLED == 1
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
@ -147,5 +150,6 @@ private:
}; };
#endif //ML505 #endif //ML505
#endif /* CPP_OSTREAM_ENABLED == 1 */
#endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_ */ #endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_ */

4
serviceinterface/ServiceInterfaceStream.cpp
View File

@ -1,5 +1,7 @@
#include "ServiceInterfaceStream.h" #include "ServiceInterfaceStream.h"
#if CPP_OSTREAM_ENABLED == 1
ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage, ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage,
bool addCrToPreamble, bool buffered, bool errStream, uint16_t port) : bool addCrToPreamble, bool buffered, bool errStream, uint16_t port) :
std::ostream(&streambuf), std::ostream(&streambuf),
@ -13,3 +15,5 @@ std::string* ServiceInterfaceStream::getPreamble() {
return streambuf.getPreamble(); return streambuf.getPreamble();
} }
#endif

5
serviceinterface/ServiceInterfaceStream.h
View File

@ -2,6 +2,9 @@
#define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ #define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_
#include "ServiceInterfaceBuffer.h" #include "ServiceInterfaceBuffer.h"
#if CPP_OSTREAM_ENABLED == 1
#include <iostream> #include <iostream>
#include <cstdio> #include <cstdio>
@ -48,4 +51,6 @@ extern ServiceInterfaceStream warning;
extern ServiceInterfaceStream error; extern ServiceInterfaceStream error;
} }
#endif /* CPP_OSTREAM_ENABLED == 1 */
#endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ */ #endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ */