summaryrefslogtreecommitdiff
path: root/src/scripting/luautil.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-27 23:30:18 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2013-04-27 23:30:18 +0200
commit5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch)
treede739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/scripting/luautil.h
parentc53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff)
parentd4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff)
downloadmanaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz
manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/scripting/luautil.h')
-rw-r--r--src/scripting/luautil.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripting/luautil.h b/src/scripting/luautil.h
index 6d078e3e..8bcc2a30 100644
--- a/src/scripting/luautil.h
+++ b/src/scripting/luautil.h
@@ -102,7 +102,7 @@ public:
lua_pushliteral(s, "__index"); // metatable, "__index"
lua_createtable(s, 0, 0); // metatable, "__index", {}
#if LUA_VERSION_NUM < 502
- luaL_register(s, NULL, members);
+ luaL_register(s, nullptr, members);
#else
luaL_setfuncs(s, members, 0);
#endif