Jason Turner
							
						 
					 | 
					
						
						
							
						
						67b5d989cb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/release-4.x' into develop
						
						
						
						
						
						
					 | 
					
						2014-04-22 19:52:01 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						c9a244019e
					 | 
					
						
						
							
							Enhance the inheritance unit tests #117
						
						
						
						
						
						
					 | 
					
						2014-04-13 08:05:46 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						926e962fc0
					 | 
					
						
						
							
							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 
						
						
					 | 
					
						2014-03-29 07:30:14 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						caf4495cff
					 | 
					
						
						
							
							Add unit tests for inheritance with multiple layers
						
						
						
						
						
						
					 | 
					
						2014-03-29 06:16:21 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						656b438002
					 | 
					
						
						
							
							First cast up chain, if that fails, cast down
						
						
						
						
						
						
					 | 
					
						2014-03-26 10:52:56 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						56b036052f
					 | 
					
						
						
							
							Add test for automatic casting down in inheritance
						
						
						
						
						
						
					 | 
					
						2014-03-26 09:14:06 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						95b69b7572
					 | 
					
						
						
							
							Merge branch 'master' into ChaiScript_5_0_CPP_11
						
						
						
						
						
						
					 | 
					
						2013-02-24 15:19:16 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						1858885010
					 | 
					
						
						
							
							Add example of wrapping data members of a class #79
						
						
						
						
						
						
					 | 
					
						2013-02-24 15:11:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						92de42e42b
					 | 
					
						
						
							
							Modify "var" to "auto" for unit tests.
						
						
						
						
						
						
					 | 
					
						2011-09-24 12:05:08 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						46a669dab1
					 | 
					
						
						
							
							Fix problem with method specifiers for bad_dynamic_boxed_cast exception. Add support for operators to Utility.hpp
						
						
						
						
						
						
					 | 
					
						2011-03-11 17:56:46 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jason Turner
							
						 
					 | 
					
						
						
							
						
						2b80ca8cc5
					 | 
					
						
						
							
							Add missing inheritance unit test
						
						
						
						
						
						
					 | 
					
						2010-08-03 01:18:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |