jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-29 15:23:02 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some duplicate code in Patternies

Browse source 
Perfect forwarding for for_each_result functor
This commit is contained in:
Silent 2017-09-08 00:56:29 +02:00
parent 49796ff0cf
commit 1f800587f1
1 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
SilentPatch/Patterns.h
View file

@ -77,7 +77,7 @@ namespace hook
std::vector<pattern_match> m_matches; std::vector<pattern_match> m_matches;
bool m_matched; bool m_matched = false;
union union
{ {
@ -91,12 +91,12 @@ namespace hook
protected: protected:
inline pattern(void* module) inline pattern(void* module)
: m_module(module), m_rangeEnd(0), m_matched(false) : m_module(module), m_rangeEnd(0)
{ {
} }
inline pattern(uintptr_t begin, uintptr_t end) inline pattern(uintptr_t begin, uintptr_t end)
: m_rangeStart(begin), m_rangeEnd(end), m_matched(false) : m_rangeStart(begin), m_rangeEnd(end)
{ {
} }
@ -120,44 +120,24 @@ namespace hook
Initialize(pattern, Len-1); Initialize(pattern, Len-1);
} }
inline pattern& count(uint32_t expected) & inline pattern&& count(uint32_t expected)
{ {
EnsureMatches(expected); EnsureMatches(expected);
assert(m_matches.size() == expected); assert(m_matches.size() == expected);
return *this; return std::forward<pattern>(*this);
} }
inline pattern& count_hint(uint32_t expected) & inline pattern&& count_hint(uint32_t expected)
{ {
EnsureMatches(expected); EnsureMatches(expected);
return *this; return std::forward<pattern>(*this);
} }
inline pattern& clear() & inline pattern&& clear()
{ {
m_matches.clear(); m_matches.clear();
m_matched = false; m_matched = false;
return *this; return std::forward<pattern>(*this);
}
inline pattern&& count(uint32_t expected) &&
{
EnsureMatches(expected);
assert(m_matches.size() == expected);
return std::move(*this);
}
inline pattern&& count_hint(uint32_t expected) &&
{
EnsureMatches(expected);
return std::move(*this);
}
inline pattern&& clear() &&
{
m_matches.clear();
m_matched = false;
return std::move(*this);
} }
inline size_t size() inline size_t size()
@ -189,12 +169,12 @@ namespace hook
} }
template <typename Pred> template <typename Pred>
inline void for_each_result(Pred pred) inline void for_each_result(Pred&& pred)
{ {
EnsureMatches(UINT32_MAX); EnsureMatches(UINT32_MAX);
for ( auto it : m_matches ) for ( auto it : m_matches )
{ {
pred(it); std::forward<Pred>(pred)(it);
} }
} }