tarantool.diff

--- tarantool-1.4.8+64+gcf66a7b+20130314+2251.orig/test/unit/objc_catchcxx.m
+++ tarantool-1.4.8+64+gcf66a7b+20130314+2251/test/unit/objc_catchcxx.m
@@ -8,7 +8,7 @@ int main()
 	luaL_openlibs(L);
 	@try {
 		luaL_error(L, "test");
-	} @catch (...) {
+	} @catch (id allOthers) {
 		printf("exception handled\n");
 	}
 	lua_close(L);
--- tarantool-1.4.8+64+gcf66a7b+20130314+2251.orig/src/box/box_lua.m
+++ tarantool-1.4.8+64+gcf66a7b+20130314+2251/src/box/box_lua.m
@@ -961,7 +961,7 @@ port_lua_add_tuple(struct port *port, st
 	lua_State *L = port_lua(port)->L;
 	@try {
 		lbox_pushtuple(L, tuple);
-	} @catch (...) {
+	} @catch (id allOthers) {
 		tnt_raise(ClientError, :ER_PROC_LUA, lua_tostring(L, -1));
 	}
 }
@@ -1277,7 +1277,7 @@ box_lua_execute(struct request *request,
 		port_add_lua_multret(port, L);
 	} @catch (tnt_Exception *e) {
 		@throw;
-	} @catch (...) {
+	} @catch (id allOthers) {
 		tnt_raise(ClientError, :ER_PROC_LUA, lua_tostring(L, -1));
 	} @finally {
 		/*
--- tarantool-1.4.8+64+gcf66a7b+20130314+2251.orig/src/lua/session.m
+++ tarantool-1.4.8+64+gcf66a7b+20130314+2251/src/lua/session.m
@@ -121,7 +121,7 @@ lbox_session_run_trigger(void *param)
 		lua_call(coro_L, 0, 0);
 	} @catch (tnt_Exception *e) {
 		@throw;
-	} @catch (...) {
+	} @catch ( id allOthers ) {
 		tnt_raise(ClientError, :ER_PROC_LUA,
 			  lua_tostring(coro_L, -1));
 	}
--- tarantool-1.4.8+64+gcf66a7b+20130314+2251.orig/src/lua/init.m
+++ tarantool-1.4.8+64+gcf66a7b+20130314+2251/src/lua/init.m
@@ -479,7 +479,7 @@ box_lua_fiber_run(va_list ap __attribute
 			/* The fiber is detached, log the error. */
 			[e log];
 		}
-	} @catch (...) {
+	} @catch (id allOthers) {
 		lua_settop(L, 1);
 		/*
 		 * The error message is already there.
@@ -941,7 +941,7 @@ lbox_pcall(struct lua_State *L)
 		lua_pushstring(L, e->errmsg);
 	} @catch (tnt_Exception *e) {
 		@throw;
-	} @catch (...) {
+	} @catch (id allOthers) {
 		lua_settop(L, 1);
 		/* completion status */
 		lua_pushboolean(L, false);
@@ -1056,7 +1056,7 @@ tarantool_lua_dostring(struct lua_State
 	} @catch (tnt_Exception *e) {
 		lua_pushstring(L, [e errmsg]);
 		return 1;
-	} @catch (...) {
+	} @catch (id allOthers) {
 		return 1;
 	}
 	return 0;