diff options
author | Adam Borowski <kilobyte@angband.pl> | 2012-08-09 14:05:34 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2012-08-09 14:35:28 +0200 |
commit | da49e36a81d2d0adbc7af12597f77978f3188478 (patch) | |
tree | 0540f2adb57f101df17f3c5edd11883361b1f858 /crawl-ref/source/cluautil.h | |
parent | 4a61b4e1c3ef69e9c138c941a127877e223cb338 (diff) | |
download | crawl-ref-da49e36a81d2d0adbc7af12597f77978f3188478.tar.gz crawl-ref-da49e36a81d2d0adbc7af12597f77978f3188478.zip |
Make inline functions static.
This avoids unnecessary non-inlined copies.
Also, we had a few large functions that had no reason for inlining, let's
have them be regular ones.
I also made "static inline" always use the same order, for easier grepping.
Diffstat (limited to 'crawl-ref/source/cluautil.h')
-rw-r--r-- | crawl-ref/source/cluautil.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/cluautil.h b/crawl-ref/source/cluautil.h index 6818decd57..55b729b989 100644 --- a/crawl-ref/source/cluautil.h +++ b/crawl-ref/source/cluautil.h @@ -67,7 +67,7 @@ int clua_stringtable(lua_State *ls, const std::vector<std::string> &s); */ template <class T> -inline static T *clua_get_lightuserdata(lua_State *ls, int ndx) +static inline T *clua_get_lightuserdata(lua_State *ls, int ndx) { return (lua_islightuserdata(ls, ndx))? static_cast<T *>(lua_touserdata(ls, ndx)) @@ -75,7 +75,7 @@ inline static T *clua_get_lightuserdata(lua_State *ls, int ndx) } template <class T> -inline static T *clua_get_userdata(lua_State *ls, const char *mt, int ndx = 1) +static inline T *clua_get_userdata(lua_State *ls, const char *mt, int ndx = 1) { return static_cast<T*>(luaL_checkudata(ls, ndx, mt)); } @@ -99,7 +99,7 @@ template <class T> T *clua_new_userdata( } template <typename T> -inline void dlua_push_userdata(lua_State *ls, T udata, const char *meta) +static inline void dlua_push_userdata(lua_State *ls, T udata, const char *meta) { T *de = clua_new_userdata<T>(ls, meta); *de = udata; |