Phil Nash 
							
						 
					 
					
						
						
							
						
						cfc37b5fe9 
					 
					
						
						
							
							Merge branch 'master' of github.com:philsquared/Catch  
						
						 
						
						... 
						
						
						
						# By Alexander Manenko
# Via Alexander Manenko (1) and Phil Nash (1)
* 'master' of github.com:philsquared/Catch:
  Fix build issue with TchRunnerMainView in XCode 5 
						
						
					 
					
						2014-04-18 08:28:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						41d3f2b88b 
					 
					
						
						
							
							Merge pull request  #269  from alexander-manenko/master  
						
						 
						
						... 
						
						
						
						Fix build issue with TchRunnerMainView in XCode 5 
						
						
					 
					
						2014-04-18 08:17:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						6c4a7cdd64 
					 
					
						
						
							
							Renamed XCode4 folder to just XCode  
						
						 
						
						... 
						
						
						
						(It’s been Xcode 5 for a long time, now, anyway) 
						
						
					 
					
						2014-04-17 07:38:10 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						970127e488 
					 
					
						
						
							
							Removed some unnecessary core macros  
						
						 
						
						
						
						
					 
					
						2014-04-16 18:01:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						87891cf38b 
					 
					
						
						
							
							Updated approval tests baselines  
						
						 
						
						
						
						
					 
					
						2014-04-16 18:00:55 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						3c34d65b5c 
					 
					
						
						
							
							Doc tweaks  
						
						 
						
						
						
						
					 
					
						2014-04-16 08:18:06 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						94f47d5f8c 
					 
					
						
						
							
							Updated docs with new [!throws] behaviour  
						
						 
						
						
						
						
					 
					
						2014-04-16 07:58:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						20cad7cb1d 
					 
					
						
						
							
							Tags beginning with a non alpha-numeric character are now disallowed.  
						
						 
						
						... 
						
						
						
						Added !throws special tag which denotes a test case to be skipped when run with -e
(the idea being that the test case is expected to throw an exception which is not caught within a XXX_THROWS assertion). 
						
						
					 
					
						2014-04-15 18:44:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						c5406a25bf 
					 
					
						
						
							
							build 35  
						
						 
						
						
						
						
					 
					
						2014-04-12 19:21:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1bccc03213 
					 
					
						
						
							
							Secondary fix for  #270  (addresses same issue with CHECK)  
						
						 
						
						
						
						
					 
					
						2014-04-12 19:20:46 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						a176b93738 
					 
					
						
						
							
							Fix for  #270  (REQUIRE continues if test throws an exception).  
						
						 
						
						... 
						
						
						
						Added test case that reproduced the bug then applied the fix. 
						
						
					 
					
						2014-04-12 19:07:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						e9d35377fa 
					 
					
						
						
							
							re-approved following recent command line description tweak  
						
						 
						
						
						
						
					 
					
						2014-04-12 19:05:03 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Manenko 
							
						 
					 
					
						
						
							
						
						3627ee6f2e 
					 
					
						
						
							
							Fix build issue with TchRunnerMainView in XCode 5  
						
						 
						
						
						
						
					 
					
						2014-03-30 18:33:40 +03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						af8cd98f20 
					 
					
						
						
							
							New version of Clara that fixes operator= issue with ref member ( #265 )  
						
						 
						
						
						
						
					 
					
						2014-03-24 18:15:04 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						472dc2a61f 
					 
					
						
						
							
							New version of Clara  
						
						 
						
						... 
						
						
						
						- interface changed slightly
- moved clara.h and tbc_text_format.h into “external” folder 
						
						
					 
					
						2014-03-17 18:40:58 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f9df35b12b 
					 
					
						
						
							
							Fixed instance of Clara::_ placeholder when using CATCH_CONFIG_RUNNER  
						
						 
						
						
						
						
					 
					
						2014-03-10 18:02:18 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						dd2810d60a 
					 
					
						
						
							
							build 30  
						
						 
						
						... 
						
						
						
						- with Clara fix for null deref crash 
						
						
					 
					
						2014-03-07 06:58:33 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						04f994a8fc 
					 
					
						
						
							
							Updated VS2010 project (removed CmdLineTests.cpp)  
						
						 
						
						
						
						
					 
					
						2014-03-07 06:53:30 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						9abb27676d 
					 
					
						
						
							
							Fix problem (hopefully) with single source definitions from Clara  
						
						 
						
						... 
						
						
						
						- define CLARA_CONFIG_MAIN in the right place 
						
						
					 
					
						2014-03-06 21:53:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						9b4c7fa0f7 
					 
					
						
						
							
							Updated cmake file with command line test removal  
						
						 
						
						
						
						
					 
					
						2014-03-06 08:21:47 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						8cd1b31931 
					 
					
						
						
							
							Merge branch 'master' of github.com:philsquared/Catch  
						
						 
						
						... 
						
						
						
						# By David Beckley
# Via David Beckley (1) and Phil Nash (1)
* 'master' of github.com:philsquared/Catch:
  Highlight block as C++ 
						
						
					 
					
						2014-03-06 08:18:06 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						fd879f7e77 
					 
					
						
						
							
							Build 28  
						
						 
						
						... 
						
						
						
						- new version of Clara
- removed command line tests 
						
						
					 
					
						2014-03-06 08:17:24 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						b9fea75109 
					 
					
						
						
							
							New version of Clara.  
						
						 
						
						... 
						
						
						
						- updated command line setup with new API
- updated STITCH macros
- force embedded Clara to use Catch’s console width (but restore it after)
- remove command line tests (as these have now moved into the Clara project) 
						
						
					 
					
						2014-03-06 08:16:06 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						174ada4caf 
					 
					
						
						
							
							Merge pull request  #251  from ThatOtherPerson/patch-1  
						
						 
						
						... 
						
						
						
						Highlight block as C++ 
						
						
					 
					
						2014-03-06 07:42:11 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Beckley 
							
						 
					 
					
						
						
							
						
						e6ee29a925 
					 
					
						
						
							
							Highlight block as C++  
						
						 
						
						... 
						
						
						
						C++ syntax highlighting was not enabled on one of the blocks. 
						
						
					 
					
						2014-03-05 16:46:20 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1f1ee3c63d 
					 
					
						
						
							
							New version of Clara  
						
						 
						
						... 
						
						
						
						- Clara now built with new stitch script (based on generateSingleInclude)
- also fixed python scripts for python 3 (print now a function rather than a keyword) 
						
						
					 
					
						2014-03-01 10:38:14 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1c2fbe146b 
					 
					
						
						
							
							build 26  
						
						 
						
						
						
						
					 
					
						2014-02-11 18:12:41 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f899552d52 
					 
					
						
						
							
							updated single include test project  
						
						 
						
						
						
						
					 
					
						2014-02-11 18:12:31 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						d29cbecfa5 
					 
					
						
						
							
							Updated single include generator to allow for embedded micro-libraries  
						
						 
						
						
						
						
					 
					
						2014-02-11 18:11:37 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						5845ae94aa 
					 
					
						
						
							
							Added private assignment operator to fix VS2010 issue  
						
						 
						
						... 
						
						
						
						- thanks to Kosta (#239 ) 
						
						
					 
					
						2014-02-11 18:11:06 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						b15726beba 
					 
					
						
						
							
							Added #include for <memory> to Clara  
						
						 
						
						... 
						
						
						
						- thanks again, Martin 
						
						
					 
					
						2014-02-11 17:45:15 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						160b74d6c7 
					 
					
						
						
							
							… and <stdexcept>  
						
						 
						
						
						
						
					 
					
						2014-02-11 17:41:11 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						633feaa4a6 
					 
					
						
						
							
							Added #include <algorithm> to clara.h  
						
						 
						
						... 
						
						
						
						- thanks Martin 
						
						
					 
					
						2014-02-11 17:40:11 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						0dc49d1b57 
					 
					
						
						
							
							Extracted stand-alone micro-library, tbc_text_format.h, from catch_text.h.  
						
						 
						
						... 
						
						
						
						- use this version in clara.h so clara can stand alone. 
						
						
					 
					
						2014-02-11 06:32:56 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						b756243935 
					 
					
						
						
							
							Fixed some comments  
						
						 
						
						
						
						
					 
					
						2014-02-10 17:31:31 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						c98a97cf90 
					 
					
						
						
							
							Tweaked Cliche macros/ names  
						
						 
						
						
						
						
					 
					
						2014-02-10 17:30:12 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						4554155e3d 
					 
					
						
						
							
							Made Clara a “Cliche” header, which will be usable independently of Catch.  
						
						 
						
						... 
						
						
						
						- This is just a first step. It still has a dependency on catch_text.h, which also needs to be made a Cliche header.
- These then need their own homes on GitHub. 
						
						
					 
					
						2014-02-10 17:20:30 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						7eb5acc183 
					 
					
						
						
							
							build 25  
						
						 
						
						... 
						
						
						
						- fix for #231  
						
						
					 
					
						2014-01-08 17:17:31 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						46a1fc7615 
					 
					
						
						
							
							Removed unnecessary union name  
						
						 
						
						
						
						
					 
					
						2014-01-07 17:43:18 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						be890d0c15 
					 
					
						
						
							
							build 24  
						
						 
						
						
						
						
					 
					
						2014-01-07 17:26:59 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						e091018514 
					 
					
						
						
							
							Fixes toString() for function pointers and added support for member function pointers.  
						
						 
						
						... 
						
						
						
						- thanks to Malcolm Noyes for supplying sample code on which the solution here was based 
						
						
					 
					
						2014-01-07 17:25:27 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						440a47011f 
					 
					
						
						
							
							Convert pointers to integrates when printing.  
						
						 
						
						... 
						
						
						
						- handles function pointers that way too (otherwise printed as 1 by gcc and clang) 
						
						
					 
					
						2014-01-04 19:12:05 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						e45e3a139a 
					 
					
						
						
							
							Clara ignores anything after a lone — (double dash)  
						
						 
						
						... 
						
						
						
						- this allows use within an environment that appends additional arguments that Clara will otherwise reject
- generated build 23 
						
						
					 
					
						2013-12-23 10:24:06 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						91ef5f7d40 
					 
					
						
						
							
							build 22  
						
						 
						
						
						
						
					 
					
						2013-12-20 19:06:26 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						886d9d397c 
					 
					
						
						
							
							Reporter command line parser errors more eagerly  
						
						 
						
						... 
						
						
						
						- show all “unrecognised option” errors 
						
						
					 
					
						2013-12-20 19:06:02 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f385a0b13d 
					 
					
						
						
							
							build 21  
						
						 
						
						
						
						
					 
					
						2013-12-19 18:42:25 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						1aa60fada9 
					 
					
						
						
							
							Changed Approx::toString() to be implemented in terms of toString( double ) (as proposed in  #233 )  
						
						 
						
						
						
						
					 
					
						2013-12-19 18:41:55 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						fb90d38310 
					 
					
						
						
							
							Changed stdout/ stderr messages to be less misleading  
						
						 
						
						
						
						
					 
					
						2013-12-19 08:07:33 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						eb760f689b 
					 
					
						
						
							
							Build 20  
						
						 
						
						
						
						
					 
					
						2013-12-18 08:38:33 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f6d2fef26b 
					 
					
						
						
							
							Updated project for OCUnit  
						
						 
						
						
						
						
					 
					
						2013-12-18 08:37:35 +00:00