Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						cc2f4ba981 
					 
					
						
						
							
							Merge from mainline  
						
						 
						
						
						
						
					 
					
						2013-12-09 16:01:23 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						37b057187d 
					 
					
						
						
							
							Make merge easier  
						
						 
						
						
						
						
					 
					
						2013-12-09 15:14:47 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						de49ec4d7c 
					 
					
						
						
							
							Fixed broken single header following script change  
						
						 
						
						... 
						
						
						
						- fixed the script (was missing #ifdefs)
- also fixed single include (Xcode) test project
- build 16 
						
						
					 
					
						2013-12-04 20:25:14 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						87b20e8dab 
					 
					
						
						
							
							SourceLineInfo takes char*s instead of std::strings  
						
						 
						
						
						
						
					 
					
						2013-12-04 08:12:30 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						47a5ad3038 
					 
					
						
						
							
							Normalised “hidden” tags  
						
						 
						
						
						
						
					 
					
						2013-12-04 07:58:39 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						3524321295 
					 
					
						
						
							
							Removed some cruft  
						
						 
						
						
						
						
					 
					
						2013-12-04 07:58:21 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						3649fdf285 
					 
					
						
						
							
							Build 15  
						
						 
						
						
						
						
					 
					
						2013-12-03 18:53:55 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						c4a089c12b 
					 
					
						
						
							
							Refactored a lot of code from headers into impl headers only compiled into one TU  
						
						 
						
						... 
						
						
						
						- also added noimpl option to single header script - which only generates the non impl code 
						
						
					 
					
						2013-12-03 18:52:41 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						8ba6555acd 
					 
					
						
						
							
							Merge pull request  #224  from PetterS/cygwinfix  
						
						 
						
						... 
						
						
						
						Fix fileno not always present. fileno(stdout) = 1. 
						
						
					 
					
						2013-11-26 15:33:37 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Petter Strandmark 
							
						 
					 
					
						
						
							
						
						c032dfa41c 
					 
					
						
						
							
							Fix fileno not always present. fileno(stdout) = STDOUT_FILENO.  
						
						 
						
						... 
						
						
						
						This was a problem when compiling on Cygwin with gcc 4.8. 
						
						
					 
					
						2013-11-26 23:20:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						5ecb72b9bb 
					 
					
						
						
							
							Build 14  
						
						 
						
						
						
						
					 
					
						2013-11-26 20:57:45 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						782c2b5891 
					 
					
						
						
							
							Added ability to load names of tests to run from a file  
						
						 
						
						... 
						
						
						
						- use -f to specify filename. Blank lines and lines starting with # are ignored
- also added --list-test-names-only to list test names out to file in a form that can be immediate read in by -f 
						
						
					 
					
						2013-11-26 20:57:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						2a14dffe97 
					 
					
						
						
							
							clean up comments  
						
						 
						
						
						
						
					 
					
						2013-11-22 07:38:50 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						993430a3c4 
					 
					
						
						
							
							Merge pull request  #222  from gnzlbg/cmake-docs  
						
						 
						
						... 
						
						
						
						Add documentation for the CMake build system 
						
						
					 
					
						2013-11-21 11:09:31 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								gnzlbg 
							
						 
					 
					
						
						
							
						
						69a921f2d6 
					 
					
						
						
							
							Add documentation for the CMake build system  
						
						 
						
						... 
						
						
						
						- new file "docs/build-system.md" to document the integration of
  Catch with popular build systems.
- document how to configure Catch as a CMake external project. 
						
						
					 
					
						2013-11-21 14:15:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						ba13f3f098 
					 
					
						
						
							
							Restored second arg to a TEST_CASE for non variadic compilers  
						
						 
						
						
						
						
					 
					
						2013-11-21 08:08:05 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						063593828c 
					 
					
						
						
							
							Removed deleted file from CMake  
						
						 
						
						
						
						
					 
					
						2013-11-21 08:07:37 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						ca7292e3a7 
					 
					
						
						
							
							Removed redundant MetaTestRunner  
						
						 
						
						
						
						
					 
					
						2013-11-19 19:03:11 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						200197f0b2 
					 
					
						
						
							
							Merge branch 'master' of github.com:philsquared/Catch  
						
						 
						
						
						
						
					 
					
						2013-11-19 07:22:24 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						337dc25ed7 
					 
					
						
						
							
							Converted all test case names to "modern" style (freeform text + tags)  
						
						 
						
						
						
						
					 
					
						2013-11-19 07:21:03 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						32e81790d6 
					 
					
						
						
							
							Added instructions for running tests from the command line  
						
						 
						
						
						
						
					 
					
						2013-11-18 22:01:48 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						ec0ef84226 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
						
					 
					
						2013-11-18 20:39:06 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						da0f4643f7 
					 
					
						
						
							
							Merge pull request  #217  from nanoant/patch/std-auto_ptr-deprecated  
						
						 
						
						... 
						
						
						
						std::auto_ptr is deprecated in c++11/c++0x 
						
						
					 
					
						2013-11-18 00:21:11 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Adam Strzelecki 
							
						 
					 
					
						
						
							
						
						d1e5480d95 
					 
					
						
						
							
							std::auto_ptr is deprecated in c++11/c++0x  
						
						 
						
						... 
						
						
						
						This will use std::unique_ptr on C++11 and remove deprecation warning. 
						
						
					 
					
						2013-11-17 18:44:35 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						765f6e6edb 
					 
					
						
						
							
							fix more links  
						
						 
						
						
						
						
					 
					
						2013-11-17 16:37:05 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						2b5cf11c7c 
					 
					
						
						
							
							fix more links  
						
						 
						
						
						
						
					 
					
						2013-11-17 16:36:08 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						c1d9e20361 
					 
					
						
						
							
							fix more links  
						
						 
						
						
						
						
					 
					
						2013-11-17 16:34:01 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						5e630a6f46 
					 
					
						
						
							
							fix links  
						
						 
						
						
						
						
					 
					
						2013-11-17 16:27:04 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						d54bee53d4 
					 
					
						
						
							
							Docs for Visual Studio integration  
						
						 
						
						
						
						
					 
					
						2013-11-17 16:23:57 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						41dabbf925 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
						
					 
					
						2013-11-17 14:19:49 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						907f514de7 
					 
					
						
						
							
							Add support for Managed tests in VS2010 & VS2012. Add support for Native tests in VS2012  
						
						 
						
						
						
						
					 
					
						2013-11-17 14:18:02 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						a9fd5b3f14 
					 
					
						
						
							
							Removed cruft from VS projects  
						
						 
						
						
						
						
					 
					
						2013-11-14 23:35:56 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						d3c8c9839f 
					 
					
						
						
							
							Merge pull request  #214  from AIM360/weibelt/fix-eol  
						
						 
						
						... 
						
						
						
						Fixed crlf issue 
						
						
					 
					
						2013-11-14 15:28:58 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						3a6ab65c82 
					 
					
						
						
							
							Merge from origin  
						
						 
						
						
						
						
					 
					
						2013-11-14 20:12:14 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						73f7f0ad1b 
					 
					
						
						
							
							Catch VS integration Part 2 - modify version, allow multiple includes  
						
						 
						
						
						
						
					 
					
						2013-11-14 19:49:49 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						f15b74c0d2 
					 
					
						
						
							
							Added some more docs  
						
						 
						
						
						
						
					 
					
						2013-11-14 19:08:19 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						8d44f2dbb2 
					 
					
						
						
							
							build 13  
						
						 
						
						
						
						
					 
					
						2013-11-13 08:10:45 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						4f57c8c589 
					 
					
						
						
							
							Print warnings if no assertions and not running with -s  
						
						 
						
						
						
						
					 
					
						2013-11-13 08:07:38 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						2f086ae255 
					 
					
						
						
							
							If no assertions print custom message  
						
						 
						
						
						
						
					 
					
						2013-11-12 19:06:08 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						ecb9432763 
					 
					
						
						
							
							Simplified and tidied test case and tag listing  
						
						 
						
						
						
						
					 
					
						2013-11-12 18:59:34 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						e9a2230ad8 
					 
					
						
						
							
							VS integration part 1 - allow catch_message.hpp to be included by more than 1 source file  
						
						 
						
						
						
						
					 
					
						2013-11-10 15:11:21 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Malcolm Noyes 
							
						 
					 
					
						
						
							
						
						8e411d27f6 
					 
					
						
						
							
							Fix line endings  
						
						 
						
						
						
						
					 
					
						2013-11-10 11:20:08 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						5320518dbc 
					 
					
						
						
							
							Build 12  
						
						 
						
						
						
						
					 
					
						2013-11-09 07:47:09 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						11ba377134 
					 
					
						
						
							
							Change one more in-page link to work with GitHub generated anchors  
						
						 
						
						
						
						
					 
					
						2013-11-09 07:43:20 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						d17bb40030 
					 
					
						
						
							
							Converted all html anchors in command line docs to match github generated anchors  
						
						 
						
						
						
						
					 
					
						2013-11-07 13:38:48 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						6916298c22 
					 
					
						
						
							
							Attempt to match html anchors (which github strips out) with the ones github generates.  
						
						 
						
						
						
						
					 
					
						2013-11-07 13:30:39 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Weibel 
							
						 
					 
					
						
						
							
						
						2e4be2125b 
					 
					
						
						
							
							Fixed crlf issue  
						
						 
						
						
						
						
					 
					
						2013-11-07 13:05:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						0712bbb251 
					 
					
						
						
							
							Merge pull request  #207  from Fraser999/list_tests_issue  
						
						 
						
						... 
						
						
						
						List tests issue 
						
						
					 
					
						2013-11-07 03:11:19 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						c2b0c6fb08 
					 
					
						
						
							
							Added missing #include for <vector>  
						
						 
						
						
						
						
					 
					
						2013-11-07 10:35:59 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phil Nash 
							
						 
					 
					
						
						
							
						
						0d4894e4bf 
					 
					
						
						
							
							Updated command line docs with -w and -d  
						
						 
						
						
						
						
					 
					
						2013-11-07 10:35:40 +00:00