patch build to include last two fixes

- see #548

README.md

@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.3.0-develop.4*
+*v1.3.1*
 
 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 

include/internal/catch_default_main.hpp

@@ -11,7 +11,7 @@
 #ifndef __OBJC__
 
 // Standard C/C++ main entry point
-int main (int argc, char * const argv[]) {
+int main (int argc, char * argv[]) {
     return Catch::Session().run( argc, argv );
 }
 

include/internal/catch_interfaces_exception.h

@@ -19,7 +19,7 @@ namespace Catch {
 
     struct IExceptionTranslator;
     typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
-    
+
     struct IExceptionTranslator {
         virtual ~IExceptionTranslator();
         virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;

include/internal/catch_matchers.hpp

@@ -17,7 +17,7 @@ namespace Matchers {
         template<typename ExpressionT> class AnyOf;
         template<typename ExpressionT> class Not;
     }
-        
+
     template<typename ExpressionT>
     struct Matcher : SharedImpl<IShared>
     {
@@ -27,7 +27,7 @@ namespace Matchers {
         virtual Ptr<Matcher> clone() const = 0;
         virtual bool match( ExpressionT const& expr ) const = 0;
         virtual std::string toString() const = 0;
-        
+
         Generic::AllOf<ExpressionT> operator && ( Matcher<ExpressionT> const& other ) const;
         Generic::AnyOf<ExpressionT> operator || ( Matcher<ExpressionT> const& other ) const;
         Generic::Not<ExpressionT> operator ! () const;
@@ -134,13 +134,13 @@ namespace Matchers {
                 anyOfExpr.add( other );
                 return anyOfExpr;
             }
-            
+
         private:
             std::vector<Ptr<Matcher<ExpressionT> > > m_matchers;
         };
 
     } // namespace Generic
-        
+
     template<typename ExpressionT>
     Generic::AllOf<ExpressionT> Matcher<ExpressionT>::operator && ( Matcher<ExpressionT> const& other ) const {
         Generic::AllOf<ExpressionT> allOfExpr;
@@ -161,7 +161,7 @@ namespace Matchers {
     Generic::Not<ExpressionT> Matcher<ExpressionT>::operator ! () const {
         return Generic::Not<ExpressionT>( *this );
     }
-        
+
 
     namespace StdString {
 

include/internal/catch_stream.hpp

@@ -96,8 +96,7 @@ namespace Catch {
         return m_os;
     }
 
-
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
     std::ostream& cout() {
         return std::cout;
     }

include/internal/catch_test_case_registry_impl.hpp

@@ -87,7 +87,10 @@ namespace Catch {
 
     class TestRegistry : public ITestCaseRegistry {
     public:
-        TestRegistry() : m_unnamedCount( 0 ) {}
+        TestRegistry()
+        :   m_currentSortOrder( RunTests::InDeclarationOrder ),
+            m_unnamedCount( 0 )
+        {}
         virtual ~TestRegistry();
 
         virtual void registerTest( TestCase const& testCase ) {
@@ -157,7 +160,7 @@ namespace Catch {
             char const* classOrQualifiedMethodName,
             NameAndDesc const& nameAndDesc,
             SourceLineInfo const& lineInfo ) {
-        
+
         getMutableRegistryHub().registerTest
             ( makeTestCase
                 (   testCase,
@@ -172,7 +175,7 @@ namespace Catch {
             NameAndDesc const& nameAndDesc ) {
         registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
     }
-    
+
     ///////////////////////////////////////////////////////////////////////////
 
     AutoReg::AutoReg

include/internal/catch_version.hpp

@@ -37,7 +37,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 1, "", 0 );
 
 }
 

projects/SelfTest/ExceptionTests.cpp

@@ -112,12 +112,13 @@ public:
     CustomStdException( const std::string& msg )
     : m_msg( msg )
     {}
-    
+    ~CustomStdException() CATCH_NOEXCEPT {}
+
     std::string getMessage() const
     {
         return m_msg;
     }
-    
+
 private:
     std::string m_msg;
 };

projects/XCode/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj

@@ -513,7 +513,7 @@
 		4A6D0C17149B3D3B00DB3EAA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0710;
 			};
 			buildConfigurationList = 4A6D0C1A149B3D3B00DB3EAA /* Build configuration list for PBXProject "CatchSelfTest" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -595,6 +595,7 @@
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = NO;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;

single_include/catch.hpp

@@ -1,6 +1,6 @@
 /*
- *  Catch v1.3.0-develop.4
+ *  Catch v1.3.1
- *  Generated: 2015-11-20 16:58:58.532767
+ *  Generated: 2015-12-09 18:10:29.846134
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6248,7 +6248,10 @@ namespace Catch {
 
     class TestRegistry : public ITestCaseRegistry {
     public:
-        TestRegistry() : m_unnamedCount( 0 ) {}
+        TestRegistry()
+        :   m_currentSortOrder( RunTests::InDeclarationOrder ),
+            m_unnamedCount( 0 )
+        {}
         virtual ~TestRegistry();
 
         virtual void registerTest( TestCase const& testCase ) {
@@ -6627,7 +6630,7 @@ namespace Catch {
         return m_os;
     }
 
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
     std::ostream& cout() {
         return std::cout;
     }
@@ -7267,7 +7270,7 @@ namespace Catch {
         return os;
     }
 
-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 1, "", 0 );
 
 }
 
@@ -10020,7 +10023,7 @@ namespace Catch {
 #ifndef __OBJC__
 
 // Standard C/C++ main entry point
-int main (int argc, char * const argv[]) {
+int main (int argc, char * argv[]) {
     return Catch::Session().run( argc, argv );
 }