Skip to content

Commit 2d84a58

Browse files
committed
change typedef to using (for clarity)
1 parent d5a492c commit 2d84a58

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

LibWrapper.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ LibWrapper::LibWrapper(const std::filesystem::path& fname) {
5454
int32_t * priority_sym = (int *)load_sym(handle, "dfhooks_priority");
5555
if (priority_sym) priority = *priority_sym;
5656

57-
preinit = (dfhooks_preinit_fn)load_sym(handle, "dfhooks_preinit");
58-
init = (dfhooks_init_fn)load_sym(handle, "dfhooks_init");
59-
shutdown = (dfhooks_shutdown_fn)load_sym(handle, "dfhooks_shutdown");
60-
update = (dfhooks_update_fn)load_sym(handle, "dfhooks_update");
61-
prerender = (dfhooks_prerender_fn)load_sym(handle, "dfhooks_prerender");
62-
sdl_event = (dfhooks_sdl_event_fn)load_sym(handle, "dfhooks_sdl_event");
63-
sdl_loop = (dfhooks_sdl_loop_fn)load_sym(handle, "dfhooks_sdl_loop");
64-
ncurses_key = (dfhooks_ncurses_key_fn)load_sym(handle, "dfhooks_ncurses_key");
57+
preinit = (dfhooks_preinit_fn*)load_sym(handle, "dfhooks_preinit");
58+
init = (dfhooks_init_fn*)load_sym(handle, "dfhooks_init");
59+
shutdown = (dfhooks_shutdown_fn*)load_sym(handle, "dfhooks_shutdown");
60+
update = (dfhooks_update_fn*)load_sym(handle, "dfhooks_update");
61+
prerender = (dfhooks_prerender_fn*)load_sym(handle, "dfhooks_prerender");
62+
sdl_event = (dfhooks_sdl_event_fn*)load_sym(handle, "dfhooks_sdl_event");
63+
sdl_loop = (dfhooks_sdl_loop_fn*)load_sym(handle, "dfhooks_sdl_loop");
64+
ncurses_key = (dfhooks_ncurses_key_fn*)load_sym(handle, "dfhooks_ncurses_key");
6565

6666
if (preinit)
6767
preinit(fname);

LibWrapper.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55

66
union SDL_Event;
77

8-
typedef void (*dfhooks_preinit_fn)(std::filesystem::path);
9-
typedef void (*dfhooks_init_fn)();
10-
typedef void (*dfhooks_shutdown_fn)();
11-
typedef void (*dfhooks_update_fn)();
12-
typedef void (*dfhooks_prerender_fn)();
13-
typedef bool (*dfhooks_sdl_event_fn)(SDL_Event* event);
14-
typedef void (*dfhooks_sdl_loop_fn)();
15-
typedef bool (*dfhooks_ncurses_key_fn)(int key);
8+
using dfhooks_preinit_fn = auto (std::filesystem::path) -> void;
9+
using dfhooks_init_fn = auto () -> void;
10+
using dfhooks_shutdown_fn = auto () -> void;
11+
using dfhooks_update_fn = auto () -> void;
12+
using dfhooks_prerender_fn = auto () -> void;
13+
using dfhooks_sdl_event_fn = auto (SDL_Event* event) -> bool;
14+
using dfhooks_sdl_loop_fn = auto () -> void;
15+
using dfhooks_ncurses_key_fn = auto (int key) -> bool;
1616

1717
struct LibWrapper {
1818
void* handle = nullptr;
1919
int32_t priority = 0;
20-
dfhooks_preinit_fn preinit = nullptr;
21-
dfhooks_init_fn init = nullptr;
22-
dfhooks_shutdown_fn shutdown = nullptr;
23-
dfhooks_update_fn update = nullptr;
24-
dfhooks_prerender_fn prerender = nullptr;
25-
dfhooks_sdl_event_fn sdl_event = nullptr;
26-
dfhooks_sdl_loop_fn sdl_loop = nullptr;
27-
dfhooks_ncurses_key_fn ncurses_key = nullptr;
20+
dfhooks_preinit_fn* preinit = nullptr;
21+
dfhooks_init_fn* init = nullptr;
22+
dfhooks_shutdown_fn* shutdown = nullptr;
23+
dfhooks_update_fn* update = nullptr;
24+
dfhooks_prerender_fn* prerender = nullptr;
25+
dfhooks_sdl_event_fn* sdl_event = nullptr;
26+
dfhooks_sdl_loop_fn* sdl_loop = nullptr;
27+
dfhooks_ncurses_key_fn* ncurses_key = nullptr;
2828

2929
LibWrapper(const std::filesystem::path& fname);
3030
virtual ~LibWrapper();

0 commit comments

Comments
 (0)