Merge remote-tracking branch 'upstream/development' into mueller/fsfw-update-3

2021-03-09 21:06:57 +01:00
parent 59028ccc3f c815905b5a
commit 9737d4cf2a
10 changed files with 31 additions and 26 deletions
--- a/container/SharedRingBuffer.cpp
+++ b/container/SharedRingBuffer.cpp
@ -1,6 +1,6 @@
 #include "SharedRingBuffer.h"
 #include "../ipc/MutexFactory.h"
-#include "../ipc/MutexHelper.h"
+#include "../ipc/MutexGuard.h"

 SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size,
        bool overwriteOld, size_t maxExcessBytes):
--- a/container/SharedRingBuffer.h
+++ b/container/SharedRingBuffer.h
@ -66,7 +66,7 @@ public:

    /**
     * The mutex handle can be accessed directly, for example to perform
-     * the lock with the #MutexHelper for a RAII compliant lock operation.
+     * the lock with the #MutexGuard for a RAII compliant lock operation.
     * @return
     */
    MutexIF* getMutexHandle() const;