ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ExpressionParser: Replace ScopeGuard with custom deleter unique_ptr.

This commit is contained in:
Jordan Woyak 2020-02-16 13:09:12 -06:00
parent 48b76ff90f
commit 44927da420
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View File

@ -15,7 +15,6 @@
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "InputCommon/ControlReference/ExpressionParser.h" #include "InputCommon/ControlReference/ExpressionParser.h"
@ -31,7 +30,17 @@ class HotkeySuppressions
{ {
public: public:
using Modifiers = std::vector<std::unique_ptr<ControlExpression>>; using Modifiers = std::vector<std::unique_ptr<ControlExpression>>;
using Suppressor = std::unique_ptr<Common::ScopeGuard>;
struct InvokingDeleter
{
template <typename T>
void operator()(T* func)
{
(*func)();
}
};
using Suppressor = std::unique_ptr<std::function<void()>, InvokingDeleter>;
bool IsSuppressed(Device::Input* input) const bool IsSuppressed(Device::Input* input) const
{ {
@ -309,10 +318,11 @@ HotkeySuppressions::MakeSuppressor(const Modifiers* modifiers,
for (auto& modifier : *modifiers) for (auto& modifier : *modifiers)
++m_suppressions[{(*final_input)->GetInput(), modifier->GetInput()}]; ++m_suppressions[{(*final_input)->GetInput(), modifier->GetInput()}];
return std::make_unique<Common::ScopeGuard>([this, modifiers, final_input]() { return Suppressor(std::make_unique<std::function<void()>>([this, modifiers, final_input]() {
for (auto& modifier : *modifiers) for (auto& modifier : *modifiers)
RemoveSuppression(modifier->GetInput(), (*final_input)->GetInput()); RemoveSuppression(modifier->GetInput(), (*final_input)->GetInput());
}); }).release(),
InvokingDeleter{});
} }
class BinaryExpression : public Expression class BinaryExpression : public Expression