archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 15:01:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix manual_fixed_typemap::init result (g_fxo)

Browse source 
Return uncasted pointer to created type
This commit is contained in:
Nekotekina 2019-09-18 02:50:32 +03:00
parent 353a7ff8e6
commit 8054735cab
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/util/fixed_typemap.hpp
View file

@ -94,7 +94,7 @@ namespace stx
// Explicitly (re)initialize object of type T possibly with dynamic type As and arguments
template <typename T, typename As = T, typename... Args>
T* init(Args&&... args) noexcept
As* init(Args&&... args) noexcept
{
auto& ptr = m_list[stx::type_counter<typeinfo>::template type<std::decay_t<T>>.index()];
@ -103,8 +103,8 @@ namespace stx
delete static_cast<T*>(ptr);
}
auto* obj = static_cast<T*>(new std::decay_t<As>(std::forward<Args>(args)...));
ptr = obj;
As* obj = new std::decay_t<As>(std::forward<Args>(args)...);
ptr = static_cast<T*>(obj);
return obj;
}