diff options
| author | Chris Robinson <[email protected]> | 2019-10-01 22:22:46 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-10-01 22:22:46 -0700 |
| commit | accac7950ce8f49a9e9ccaa4be24e96347f4aca3 (patch) | |
| tree | f9bf23a1a680699f06f54cfdaaa112cc4f399c1a | |
| parent | 28d54efe72323cc6791d0ee3d15accff7765e853 (diff) | |
Silence some warnings from GCC in the router
| -rw-r--r-- | router/router.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/router/router.cpp b/router/router.cpp index 88e75b67..85a75aea 100644 --- a/router/router.cpp +++ b/router/router.cpp @@ -81,7 +81,7 @@ static void AddModule(HMODULE module, const WCHAR *name) { if(drv.Module == module) { - TRACE("Skipping already-loaded module %p\n", module); + TRACE("Skipping already-loaded module %p\n", decltype(std::declval<void*>()){module}); FreeLibrary(module); return; } @@ -99,8 +99,8 @@ static void AddModule(HMODULE module, const WCHAR *name) /* Load required functions. */ int err = 0; #define LOAD_PROC(x) do { \ - newdrv.x = reinterpret_cast<decltype(newdrv.x)>( \ - GetProcAddress(module, #x)); \ + newdrv.x = reinterpret_cast<decltype(newdrv.x)>(reinterpret_cast<void*>( \ + GetProcAddress(module, #x))); \ if(!newdrv.x) \ { \ ERR("Failed to find entry point for %s in %ls\n", #x, name); \ @@ -233,7 +233,7 @@ static void AddModule(HMODULE module, const WCHAR *name) DriverList.pop_back(); return; } - TRACE("Loaded module %p, %ls, ALC %d.%d\n", module, name, + TRACE("Loaded module %p, %ls, ALC %d.%d\n", decltype(std::declval<void*>()){module}, name, newdrv.ALCVer>>8, newdrv.ALCVer&255); #undef LOAD_PROC } |