mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

updating code from Flying Laptop

Browse Source 
This is the framework of Flying Laptop OBSW version A.13.0.
This commit is contained in:
Ulrich Mohr
2018-07-12 16:29:32 +02:00
parent 1d22a6c97e
commit 575f70ba03
395 changed files with 12807 additions and 8404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
objectmanager/ObjectManager.cpp
View File

@ -1,13 +1,3 @@
/*
* ObjectManager.cpp
*
* Created on: Sep 18, 2012
* Author: baetz
*/
#include <framework/objectmanager/ObjectManager.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <cstdlib>
@ -37,7 +27,6 @@ ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) {
}
ReturnValue_t ObjectManager::remove( object_id_t id ) {
std::map<object_id_t, SystemObjectIF*>::iterator it = this->objectList.find( id );
if ( this->getSystemObject(id) != NULL ) {
this->objectList.erase( id );
debug << "ObjectManager::removeObject: Object " << std::hex << (int)id << std::dec << " removed." << std::endl;
@ -67,7 +56,6 @@ ObjectManager::ObjectManager( ) : produceObjects(NULL) {
}
void ObjectManager::initialize() {
//TODO: Include check if already initialized?
this->produceObjects();
ReturnValue_t return_value = RETURN_FAILED;
uint32_t error_count = 0;