summaryrefslogtreecommitdiff
path: root/sysutils/conky/files/patch-src_luamm.cc
blob: 2d28deba36a5112ed6966934b0ceb9dc9d6d5b39 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- src/luamm.cc.orig	2016-07-20 16:53:48 UTC
+++ src/luamm.cc
@@ -57,7 +57,8 @@ namespace lua {
 				lua_pushstring(l, e.what());
 			}
 			catch(...) {
-				lua_pushstring(l, ptr->__cxa_exception_type()->name());
+//				lua_pushstring(l, ptr->__cxa_exception_type()->name());
+				lua_pushstring(l, "Unknown exception");
 			}
 			return 1;
 		}
@@ -344,7 +345,7 @@ namespace lua {
 		pushinteger(what);
 		pushinteger(data);
 		call(2, 1, 0);
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;
@@ -427,7 +428,7 @@ namespace lua {
 
 		call(2, MULTRET, 0);
 
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;
@@ -466,7 +467,7 @@ namespace lua {
 		pushvalue(index1);
 		pushvalue(index2);
 		call(2, 1, 0);
-		assert(isnumber(-1));
+		assert(isanumber(-1));
 		int r = tointeger(-1);
 		pop();
 		return r;