From 111c5a3dc080a4d454dbcadb6c211ccf2c749da7 Mon Sep 17 00:00:00 2001 From: couriersud Date: Wed, 25 May 2016 19:16:01 +0200 Subject: Remove dependency on osd_ticks. Converted palloc and friends into templates. First effort on a separate plib namespace. (nw) --- src/lib/netlist/plib/pdynlib.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/lib/netlist/plib/pdynlib.cpp') diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index d08f194a137..4f264a7550b 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -1,18 +1,20 @@ // license:GPL-2.0+ // copyright-holders:Couriersud /* - * pdynlib.c + * dynlib.c * */ -#include "pdynlib.h" +#include #ifdef _WIN32 #include "windows.h" #else #include #endif -pdynlib::pdynlib(const pstring libname) +PLIB_NAMESPACE_START() + +dynlib::dynlib(const pstring libname) : m_isLoaded(false), m_lib(nullptr) { #ifdef _WIN32 @@ -38,7 +40,7 @@ pdynlib::pdynlib(const pstring libname) #endif } -pdynlib::pdynlib(const pstring path, const pstring libname) +dynlib::dynlib(const pstring path, const pstring libname) : m_isLoaded(false), m_lib(nullptr) { // printf("win: loading <%s>\n", libname.cstr()); @@ -68,7 +70,7 @@ pdynlib::pdynlib(const pstring path, const pstring libname) #endif } -pdynlib::~pdynlib() +dynlib::~dynlib() { if (m_lib != nullptr) { @@ -80,12 +82,12 @@ pdynlib::~pdynlib() } } -bool pdynlib::isLoaded() const +bool dynlib::isLoaded() const { return m_isLoaded; } -void *pdynlib::getsym_p(const pstring name) +void *dynlib::getsym_p(const pstring name) { #ifdef _WIN32 return (void *) GetProcAddress((HMODULE) m_lib, name.cstr()); @@ -93,3 +95,5 @@ void *pdynlib::getsym_p(const pstring name) return dlsym(m_lib, name.cstr()); #endif } + +PLIB_NAMESPACE_END() -- cgit v1.2.3-70-g09d2