From 8152825e9fc89c227ad865beb60c9e5d1d1c83a7 Mon Sep 17 00:00:00 2001
From: Phil Nash <phil@twobluecubes.com>
Date: Mon, 15 Aug 2011 09:06:31 +0100
Subject: [PATCH] Fixed Obj-C related #include ordering

---
 .gitignore                                    |  3 +-
 include/catch.hpp                             |  1 +
 .../OCTest/OCTest.xcodeproj/project.pbxproj   |  7 +++
 single_include/catch.hpp                      | 48 +++++++++----------
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6de4c186..541f1be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ Debug
 Release
 *.user
 *.xcuserstate
-/Test/Test.xcodeproj/xcuserdata/
\ No newline at end of file
+/Test/Test.xcodeproj/xcuserdata/
+.DS_Store
\ No newline at end of file
diff --git a/include/catch.hpp b/include/catch.hpp
index 0b0bb62c..d314d3c2 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -28,6 +28,7 @@
 #include "internal/catch_generators.hpp"
 #include "internal/catch_interfaces_exception.h"
 #include "internal/catch_approx.hpp"
+#include "internal/catch_test_case_info.hpp"
 
 #ifdef __OBJC__
 #include "internal/catch_objc.hpp"
diff --git a/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj b/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
index cdee764b..afed59e0 100644
--- a/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
+++ b/projects/XCode/OCTest/OCTest.xcodeproj/project.pbxproj
@@ -144,7 +144,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "OCTest" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* OCTest */;
 			projectDirPath = "";
 			projectRoot = "";
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index cb1043b1..19b0946b 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -2553,30 +2553,6 @@ namespace Catch
 
 } // end namespace Catch
 
-
-#ifdef __OBJC__
-// #included from: internal/catch_objc.hpp
-
-/*
- *  catch_objc.hpp
- *  Catch
- *
- *  Created by Phil on 14/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
-
-#import <objc/runtime.h>
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
 // #included from: internal/catch_test_case_info.hpp
 
 /*
@@ -2804,6 +2780,30 @@ namespace Catch
 }
 
 
+#ifdef __OBJC__
+// #included from: internal/catch_objc.hpp
+
+/*
+ *  catch_objc.hpp
+ *  Catch
+ *
+ *  Created by Phil on 14/11/2010.
+ *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
+
+#import <objc/runtime.h>
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
 ///////////////////////////////////////////////////////////////////////////////
 // This protocol is really only here for (self) documenting purposes, since
 // all its methods are optional.