Jason Turner d0ce78061c Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/function_call.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2013-04-25 09:40:22 -06:00
..
any.hpp Revert "Use unique_ptr instead of shared_ptr in our any implementation, >10% speed improvement" 2012-07-13 13:54:48 -06:00
bad_boxed_cast.hpp Merge branch 'master' into 2010-09-09-CxScript 2012-06-01 08:50:15 -06:00
bind_first.hpp Prevent leaking macros #76 2012-11-07 14:13:08 -07:00
bootstrap_stl.hpp Fix linux build error discovered with 4.0.0 release 2012-11-17 20:30:53 -07:00
bootstrap.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-25 12:08:32 -07:00
boxed_cast_helper.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
boxed_cast.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
boxed_number.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
boxed_value.hpp Use make_shared #64 2012-07-13 12:25:50 -06:00
dispatchkit.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
dynamic_cast_conversion.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
dynamic_object.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-25 12:08:32 -07:00
exception_specification.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-02-25 12:08:32 -07:00
function_call_detail.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
function_call.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
handle_return.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
operators.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
proxy_constructors.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
proxy_functions_detail.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
proxy_functions.hpp Merge branch 'master' into ChaiScript_5_0_CPP_11 2013-04-25 09:40:22 -06:00
register_function.hpp Update copyrights to 2012 #23 2012-05-16 11:55:51 -06:00
type_info.hpp C++11 needs constexpr constructor when object used in constexpr expression 2013-02-27 13:33:27 +08:00