diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/emu/luaengine.h | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/emu/luaengine.h')
-rw-r--r-- | src/emu/luaengine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h index 7f9018d3759..9bc6275100e 100644 --- a/src/emu/luaengine.h +++ b/src/emu/luaengine.h @@ -46,7 +46,7 @@ public: void periodic_check(); bool frame_hook(); - void resume(lua_State *L, int nparam = 0, lua_State *root = NULL); + void resume(lua_State *L, int nparam = 0, lua_State *root = nullptr); void set_machine(running_machine *machine) { m_machine = machine; update_machine(); } private: struct hook { @@ -57,7 +57,7 @@ private: void set(lua_State *L, int idx); lua_State *precall(); void call(lua_engine *engine, lua_State *T, int nparam); - bool active() const { return L != NULL; } + bool active() const { return L != nullptr; } }; static const char *const tname_ioport; |