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

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +4968 -17238
958 changed files with 4968 additions and 17238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53cada41ef - Show all commits

3
tcdistribution/CCSDSDistributor.h
View File

@@ -15,7 +15,8 @@
* The Secondary Header (with Service/Subservice) is ignored. * The Secondary Header (with Service/Subservice) is ignored.
* @ingroup tc_distribution * @ingroup tc_distribution
*/ */
class CCSDSDistributor : public TcDistributor, class CCSDSDistributor:
public TcDistributor,
public CCSDSDistributorIF, public CCSDSDistributorIF,
public AcceptsTelecommandsIF { public AcceptsTelecommandsIF {
public: public:

3
tcdistribution/CCSDSDistributorIF.h
View File

@@ -36,8 +36,7 @@ public:
/** /**
* The empty virtual destructor. * The empty virtual destructor.
*/ */
virtual ~CCSDSDistributorIF() { virtual ~CCSDSDistributorIF() {}
}
}; };

1
tcdistribution/CFDPDistributor.cpp
View File

@@ -1,4 +1,3 @@
#include "CCSDSDistributorIF.h" #include "CCSDSDistributorIF.h"
#include "CFDPDistributor.h" #include "CFDPDistributor.h"

3
tcdistribution/CFDPDistributor.h
View File

@@ -15,7 +15,8 @@
* services. * services.
* @ingroup tc_distribution * @ingroup tc_distribution
*/ */
class CFDPDistributor: public TcDistributor, class CFDPDistributor:
public TcDistributor,
public CFDPDistributorIF, public CFDPDistributorIF,
public AcceptsTelecommandsIF { public AcceptsTelecommandsIF {
public: public: