Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/torch7.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Alonso <lalonso@twitter.com>2016-03-11 03:26:38 +0300
committerLuke Alonso <lalonso@twitter.com>2016-03-11 03:26:38 +0300
commit25e9799f012d4d2a416881ea6caab9c6ac82b1c9 (patch)
tree7459a5af94fead56e282165f5b97182c366fa269 /generic
parent238dfdd4659f92fa233f769e17fe126543a7a7b1 (diff)
Avoid multiple definitions of luaG_ utils.
Diffstat (limited to 'generic')
-rw-r--r--generic/luaG.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/luaG.h b/generic/luaG.h
index 259742f..fc1a3cc 100644
--- a/generic/luaG.h
+++ b/generic/luaG.h
@@ -6,7 +6,7 @@
#define luaG_(NAME) TH_CONCAT_3(luaG_,Real,NAME)
#endif
-inline void luaG_(pushreal)(lua_State *L, accreal n) {
+static void luaG_(pushreal)(lua_State *L, accreal n) {
#if defined(TH_REAL_IS_FLOAT) || defined(TH_REAL_IS_DOUBLE) || LUA_VERSION_NUM < 503
lua_pushnumber(L, (lua_Number)n);
#elif defined(TH_REAL_IS_BYTE) || defined(TH_REAL_IS_CHAR) || defined(TH_REAL_IS_SHORT) || defined(TH_REAL_IS_INT) || defined(TH_REAL_IS_LONG)
@@ -16,7 +16,7 @@ inline void luaG_(pushreal)(lua_State *L, accreal n) {
#endif
}
-inline real luaG_(checkreal)(lua_State *L, int idx) {
+static real luaG_(checkreal)(lua_State *L, int idx) {
#if defined(TH_REAL_IS_FLOAT) || defined(TH_REAL_IS_DOUBLE) || LUA_VERSION_NUM < 503
return (lua_Number)luaL_checknumber(L, idx);
#elif defined(TH_REAL_IS_BYTE) || defined(TH_REAL_IS_CHAR) || defined(TH_REAL_IS_SHORT) || defined(TH_REAL_IS_INT) || defined(TH_REAL_IS_LONG)
@@ -26,7 +26,7 @@ inline real luaG_(checkreal)(lua_State *L, int idx) {
#endif
}
-inline real luaG_(optreal)(lua_State *L, int idx, real n) {
+static real luaG_(optreal)(lua_State *L, int idx, real n) {
#if defined(TH_REAL_IS_FLOAT) || defined(TH_REAL_IS_DOUBLE) || LUA_VERSION_NUM < 503
return (lua_Number)luaL_optnumber(L, idx, (lua_Number)n);
#elif defined(TH_REAL_IS_BYTE) || defined(TH_REAL_IS_CHAR) || defined(TH_REAL_IS_SHORT) || defined(TH_REAL_IS_INT) || defined(TH_REAL_IS_LONG)