Merge commit 'ebfbb3f6dfb68e9c4701f1068f35f4c33ff47d07' into fix-build-with-warnings-enabled

2018-12-22 16:05:36 -05:00
parent 94a854cfa2 ebfbb3f6df
commit 50a4aa25ab
1 changed files with 2 additions and 2 deletions
--- a/3rdparty/toluapp/include/tolua++.h
+++ b/3rdparty/toluapp/include/tolua++.h
@@ -140,13 +140,13 @@ static inline const char* tolua_tocppstring (lua_State* L, int narg, const char*

 	const char* s = tolua_tostring(L, narg, def);
 	return s?s:"";
-};
+}

 static inline const char* tolua_tofieldcppstring (lua_State* L, int lo, int index, const char* def) {

 	const char* s = tolua_tofieldstring(L, lo, index, def);
 	return s?s:"";
-};
+}

 #else
 #define tolua_tocppstring tolua_tostring