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
606 B
C++
25 lines
606 B
C++
#pragma once
|
|
|
|
#include "concurrency/OSThread.h"
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
/**
|
|
* @brief Periodically invoke a callback. This just provides C-style callback conventions
|
|
* rather than a virtual function - FIXME, remove?
|
|
*/
|
|
class Periodic : public OSThread
|
|
{
|
|
int32_t (*callback)();
|
|
|
|
public:
|
|
// callback returns the period for the next callback invocation (or 0 if we should no longer be called)
|
|
Periodic(const char *name, int32_t (*_callback)()) : OSThread(name), callback(_callback) {}
|
|
|
|
protected:
|
|
int32_t runOnce() override { return callback(); }
|
|
};
|
|
|
|
} // namespace concurrency
|