Skip to content

Commit 24a35ce

Browse files
committed
Merge branch 'dev' of https://github.com/qudix/commonlibf4 into dev
2 parents 161172c + 9e0ccf9 commit 24a35ce

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

CommonLibF4/include/REL/Relocation.h

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ namespace REL
263263

264264
template <class... Args>
265265
std::invoke_result_t<const value_type&, Args...> operator()(Args&&... a_args) const
266-
noexcept(std::is_nothrow_invocable_v<const value_type&, Args...>)
267-
requires(std::invocable<const value_type&, Args...>)
266+
noexcept(std::is_nothrow_invocable_v<const value_type&, Args...>) requires(std::invocable<const value_type&, Args...>)
268267
{
269268
return REL::invoke(get(), std::forward<Args>(a_args)...);
270269
}
@@ -279,58 +278,49 @@ namespace REL
279278
return stl::unrestricted_cast<value_type>(_impl);
280279
}
281280

282-
283281
template <std::integral U>
284-
void write(const U& a_data)
285-
requires(std::same_as<value_type, std::uintptr_t>)
282+
void write(const U& a_data) requires(std::same_as<value_type, std::uintptr_t>)
286283
{
287284
safe_write(address(), std::addressof(a_data), sizeof(T));
288285
}
289286

290287
template <class U>
291-
void write(const std::span<U> a_data)
292-
requires(std::same_as<value_type, std::uintptr_t>)
288+
void write(const std::span<U> a_data) requires(std::same_as<value_type, std::uintptr_t>)
293289
{
294290
safe_write(address(), a_data.data(), a_data.size_bytes());
295291
}
296292

297293
template <std::size_t N>
298-
std::uintptr_t write_branch(const std::uintptr_t a_dst)
299-
requires(std::same_as<value_type, std::uintptr_t>)
294+
std::uintptr_t write_branch(const std::uintptr_t a_dst) requires(std::same_as<value_type, std::uintptr_t>)
300295
{
301296
return F4SE::GetTrampoline().write_branch<N>(address(), a_dst);
302297
}
303298

304299
template <std::size_t N, class F>
305-
std::uintptr_t write_branch(const F a_dst)
306-
requires(std::same_as<value_type, std::uintptr_t>)
300+
std::uintptr_t write_branch(const F a_dst) requires(std::same_as<value_type, std::uintptr_t>)
307301
{
308302
return F4SE::GetTrampoline().write_branch<N>(address(), stl::unrestricted_cast<std::uintptr_t>(a_dst));
309303
}
310304

311305
template <std::size_t N>
312-
std::uintptr_t write_call(const std::uintptr_t a_dst)
313-
requires(std::same_as<value_type, std::uintptr_t>)
306+
std::uintptr_t write_call(const std::uintptr_t a_dst) requires(std::same_as<value_type, std::uintptr_t>)
314307
{
315308
return F4SE::GetTrampoline().write_call<N>(address(), a_dst);
316309
}
317310

318311
template <std::size_t N, class F>
319-
std::uintptr_t write_call(const F a_dst)
320-
requires(std::same_as<value_type, std::uintptr_t>)
312+
std::uintptr_t write_call(const F a_dst) requires(std::same_as<value_type, std::uintptr_t>)
321313
{
322314
return F4SE::GetTrampoline().write_call<N>(address(), stl::unrestricted_cast<std::uintptr_t>(a_dst));
323315
}
324316

325-
void write_fill(const std::uint8_t a_value, const std::size_t a_count)
326-
requires(std::same_as<value_type, std::uintptr_t>)
317+
void write_fill(const std::uint8_t a_value, const std::size_t a_count) requires(std::same_as<value_type, std::uintptr_t>)
327318
{
328319
safe_fill(address(), a_value, a_count);
329320
}
330321

331322
template <class U = value_type>
332-
std::uintptr_t write_vfunc(std::size_t a_idx, std::uintptr_t a_newFunc)
333-
requires(std::same_as<U, std::uintptr_t>)
323+
std::uintptr_t write_vfunc(std::size_t a_idx, std::uintptr_t a_newFunc) requires(std::same_as<U, std::uintptr_t>)
334324
{
335325
const auto addr = address() + (sizeof(void*) * a_idx);
336326
const auto result = *reinterpret_cast<std::uintptr_t*>(addr);
@@ -339,8 +329,7 @@ namespace REL
339329
}
340330

341331
template <class F>
342-
std::uintptr_t write_vfunc(std::size_t a_idx, F a_newFunc)
343-
requires(std::same_as<value_type, std::uintptr_t>)
332+
std::uintptr_t write_vfunc(std::size_t a_idx, F a_newFunc) requires(std::same_as<value_type, std::uintptr_t>)
344333
{
345334
return write_vfunc(a_idx, stl::unrestricted_cast<std::uintptr_t>(a_newFunc));
346335
}

0 commit comments

Comments
 (0)