mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-14 07:21:30 +10:00
Jorropo
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
25 lines
331 B
C++
25 lines
331 B
C++
#pragma once
|
|
|
|
#include "Lock.h"
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
/**
|
|
* @brief RAII lock guard
|
|
*/
|
|
class LockGuard
|
|
{
|
|
public:
|
|
explicit LockGuard(Lock *lock);
|
|
~LockGuard();
|
|
|
|
LockGuard(const LockGuard &) = delete;
|
|
LockGuard &operator=(const LockGuard &) = delete;
|
|
|
|
private:
|
|
Lock *lock;
|
|
};
|
|
|
|
} // namespace concurrency
|