From 9ca0988e0f599f0f83e6bfe039f4838d905ab557 Mon Sep 17 00:00:00 2001
From: Phil Nash <phil@twobluecubes.com>
Date: Tue, 18 Jan 2011 19:52:19 +0000
Subject: [PATCH] Renamed catch_default_main.hpp to catch_with_main.hpp

---
 Test/Test.xcodeproj/project.pbxproj           | 4 ++--
 Test/TestMain.cpp                             | 2 +-
 catch_default_main.hpp => catch_with_main.hpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename catch_default_main.hpp => catch_with_main.hpp (68%)

diff --git a/Test/Test.xcodeproj/project.pbxproj b/Test/Test.xcodeproj/project.pbxproj
index 951515e7..f338af2b 100644
--- a/Test/Test.xcodeproj/project.pbxproj
+++ b/Test/Test.xcodeproj/project.pbxproj
@@ -56,7 +56,7 @@
 		4AFC341912809A36003A0C29 /* catch_resultinfo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_resultinfo.hpp; path = ../internal/catch_resultinfo.hpp; sourceTree = SOURCE_ROOT; };
 		4AFC341A12809A36003A0C29 /* catch_runner_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_runner_impl.hpp; path = ../internal/catch_runner_impl.hpp; sourceTree = SOURCE_ROOT; };
 		4AFC341B12809A36003A0C29 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_test_case_info.hpp; path = ../internal/catch_test_case_info.hpp; sourceTree = SOURCE_ROOT; };
-		4AFC341C12809A45003A0C29 /* catch_default_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_default_main.hpp; path = ../catch_default_main.hpp; sourceTree = SOURCE_ROOT; };
+		4AFC341C12809A45003A0C29 /* catch_with_main.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_with_main.hpp; path = ../catch_with_main.hpp; sourceTree = SOURCE_ROOT; };
 		4AFC341D12809A45003A0C29 /* catch_reporter_basic.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_basic.hpp; path = ../catch_reporter_basic.hpp; sourceTree = SOURCE_ROOT; };
 		4AFC341E12809A45003A0C29 /* catch_reporter_xml.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_reporter_xml.hpp; path = ../catch_reporter_xml.hpp; sourceTree = SOURCE_ROOT; };
 		4AFC341F12809A45003A0C29 /* catch_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = catch_list.hpp; path = ../internal/catch_list.hpp; sourceTree = SOURCE_ROOT; };
@@ -196,7 +196,7 @@
 			isa = PBXGroup;
 			children = (
 				4A302DE312D5114900C84B67 /* catch.hpp */,
-				4AFC341C12809A45003A0C29 /* catch_default_main.hpp */,
+				4AFC341C12809A45003A0C29 /* catch_with_main.hpp */,
 				4AFC38161284B387003A0C29 /* catch_runner.hpp */,
 				4AA7E96B129FA282005A0B97 /* Reporters */,
 				4AFC341412809A1B003A0C29 /* Internal */,
diff --git a/Test/TestMain.cpp b/Test/TestMain.cpp
index 1d6a4655..83263367 100644
--- a/Test/TestMain.cpp
+++ b/Test/TestMain.cpp
@@ -11,7 +11,7 @@
  */
 
 #include "../internal/catch_self_test.hpp"
-#include "../catch_default_main.hpp"
+#include "../catch_with_main.hpp"
 
 TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" )
 {
diff --git a/catch_default_main.hpp b/catch_with_main.hpp
similarity index 68%
rename from catch_default_main.hpp
rename to catch_with_main.hpp
index a22ac976..3ea9d8bb 100644
--- a/catch_default_main.hpp
+++ b/catch_with_main.hpp
@@ -1,5 +1,5 @@
 /*
- *  catch_default_main.hpp
+ *  catch_with_main.hpp
  *  Catch
  *
  *  Created by Phil on 01/11/2010.
@@ -9,8 +9,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
-#ifndef TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED
 
 #include "catch_runner.hpp"
 #include "catch.hpp"
@@ -20,4 +20,4 @@ int main (int argc, char * const argv[])
     return Catch::Main( argc, argv );
 }
 
-#endif // TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
\ No newline at end of file
+#endif // TWOBLUECUBES_CATCH_WITH_MAIN_HPP_INCLUDED
\ No newline at end of file