Merge remote-tracking branch 'origin/release-4.x'

Conflicts:
	.travis.yml
	CMakeLists.txt
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_common.hpp
This commit is contained in:
Jason Turner
2014-03-29 07:30:14 -06:00
16 changed files with 220 additions and 87 deletions

View File

@@ -742,7 +742,7 @@ namespace chaiscript
if (t_handler) {
t_handler->handle(bv, m_engine);
}
throw bv;
throw;
}
}
@@ -768,7 +768,7 @@ namespace chaiscript
if (t_handler) {
t_handler->handle(bv, m_engine);
}
throw bv;
throw;
}
}
@@ -798,7 +798,7 @@ namespace chaiscript
if (t_handler) {
t_handler->handle(bv, m_engine);
}
throw bv;
throw;
}
}
@@ -814,7 +814,7 @@ namespace chaiscript
if (t_handler) {
t_handler->handle(bv, m_engine);
}
throw bv;
throw;
}
}
@@ -834,7 +834,7 @@ namespace chaiscript
if (t_handler) {
t_handler->handle(bv, m_engine);
}
throw bv;
throw;
}
}
};