Refactored main() a bit

include/catch_runner.hpp

@@ -140,7 +140,9 @@ namespace Catch
         Config config;
 //        if( isDebuggerActive() )
 //            config.useStream( "debug" );
-        return Main( argc, argv, config );
+        int result = Main( argc, argv, config );
+        Catch::Context::cleanUp();
+        return result;        
     }
     
 } // end namespace Catch

include/internal/catch_context_impl.hpp

@@ -5,13 +5,14 @@
  *  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)
  */
-#include "catch_context.h"
-#include "catch_reporter_registry.hpp"
 #include "catch_test_case_registry_impl.hpp"
-#include "catch_exception_translator_registry.hpp"
 #include "catch_runner_impl.hpp"
 #include "catch_generators_impl.hpp"
 #include "catch_console_colour_impl.hpp"
+
+#include "catch_exception_translator_registry.hpp"
+#include "catch_context.h"
+#include "catch_reporter_registry.hpp"
 #include "catch_stream.hpp"
 
 namespace Catch

include/internal/catch_default_main.hpp

@@ -1,41 +1,38 @@
 /*
- *  catch_default_main.hpp
- *  Catch
- *
  *  Created by Phil on 20/05/2011.
  *  Copyright 2011 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)
- *
  */
-
 #ifndef TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
 
-int main (int argc, char * const argv[])
-{
-#ifdef __OBJC__
-    
+#ifndef __OBJC__
+
+// Standard C/C++ main entry point
+int main (int argc, char * const argv[]) {
+    return Catch::Main( argc, argv );    
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
 #if !CATCH_ARC_ENABLED
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 #endif
     
-    Catch::registerTestMethods();
-    
+    Catch::registerTestMethods();    
     int result = Catch::Main( argc, (char* const*)argv );
     
 #if !CATCH_ARC_ENABLED
     [pool drain];
 #endif
     
-#else
-    
-    int result =Catch::Main( argc, argv );
-    
-#endif
-    Catch::Context::cleanUp();
     return result;
 }
 
+#endif // __OBJC__
+
 #endif // TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED