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

C-style cast cleanup (partial)

Browse source 
Replace C-style casts with C++ casts.
This commit is contained in:
Nekotekina 2019-11-28 21:18:37 +03:00
parent 8bd52c9843
commit 5b9df53c13
20 changed files with 280 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Utilities/dynamic_library.h
View file

@ -4,35 +4,35 @@ namespace utils
{
class dynamic_library
{
void *m_handle = nullptr;
void* m_handle = nullptr;
public:
dynamic_library() = default;
dynamic_library(const std::string &path);
dynamic_library(const std::string& path);
~dynamic_library();
bool load(const std::string &path);
bool load(const std::string& path);
void close();
private:
void *get_impl(const std::string &name) const;
void* get_impl(const std::string& name) const;
public:
template<typename Type = void>
Type *get(const std::string &name) const
template <typename Type = void>
Type* get(const std::string& name) const
{
Type *result;
*(void **)(&result) = get_impl(name);
Type* result;
*reinterpret_cast<void**>(&result) = get_impl(name);
return result;
}
template<typename Type>
bool get(Type *&function, const std::string &name) const
template <typename Type>
bool get(Type*& function, const std::string& name) const
{
*(void **)(&function) = get_impl(name);
*reinterpret_cast<void**>(&function) = get_impl(name);
return !!function;
return function != nullptr;
}
bool loaded() const;
@ -51,15 +51,15 @@ namespace utils
template <typename R, typename... Args>
struct dynamic_import<R(Args...)>
{
R(*ptr)(Args...);
R (*ptr)(Args...);
const char* const lib;
const char* const name;
// Constant initialization
constexpr dynamic_import(const char* lib, const char* name)
: ptr(nullptr)
, lib(lib)
, name(name)
: ptr(nullptr)
, lib(lib)
, name(name)
{
}
@ -68,7 +68,7 @@ namespace utils
if (!ptr)
{
// TODO: atomic
ptr = reinterpret_cast<R(*)(Args...)>(get_proc_address(lib, name));
ptr = reinterpret_cast<R (*)(Args...)>(get_proc_address(lib, name));
}
}