diff options
Diffstat (limited to 'c/common.h')
| -rw-r--r-- | c/common.h | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -29,12 +29,12 @@ struct Library { Library(const TCHAR* tszLibrary); ~Library(); - template <typename T> T* GetProcAddress(const char* szProc); + template <class T> T* GetProcAddress(const char* szProc); private: HMODULE m_hModule; }; -template <typename T> +template <class T> T* Library::GetProcAddress(const char* const szProc) { return (T*)(void*)::GetProcAddress(m_hModule, szProc); @@ -43,8 +43,8 @@ T* Library::GetProcAddress(const char* const szProc) /* Create and return an object of type C. If construction fails, * return nothing. The returned value must be checked before being * used, as dereferencing is undefined if the value is empty. */ -template <class C, typename ...T> -std::optional<C> maybe_make(T ...args) +template <class C, class... T> +std::optional<C> maybe_make(T... args) { try { return C(args...); @@ -53,18 +53,18 @@ std::optional<C> maybe_make(T ...args) } } -/* Call Windows API function and throw error if NULL is returned. */ -template <auto f, typename ...T> -inline auto throw_nil(T ...args) +/* Call Windows API function, throwing error on NULL. */ +template <auto f, class... T> +inline auto throw_nil(T... args) { auto r = f(args...); if (!r) throw Win32Error(GetLastError()); return r; } -/* Call Windows API function and show a warning if NULL is returned. */ -template <auto f, typename ...T> -inline auto warn_nil(T ...args) +/* Call Windows API function, showing a warning on NULL. */ +template <auto f, class... T> +inline auto warn_nil(T... args) { decltype(f(args...)) r; try { |