Build 1.5.8

Merge branch 'BillyONeal-master'
Merge branch 'master' of https://github.com/BillyONeal/Catch into BillyONeal-master
2025-09-14 17:35:39 +02:00 · 2016-10-26 12:08:26 +01:00 · 2016-10-26 12:06:35 +01:00 · 2016-10-26 12:04:38 +01:00 · 2016-10-14 14:28:15 -07:00 · 2016-10-14 14:16:21 -07:00
7 changed files with 24 additions and 18 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,23 +119,22 @@ matrix:

    # 3/ OSX Clang Builds
    - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
      compiler: clang
      env: COMPILER='ccache clang++' BUILD_TYPE='Debug'

    - os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7
      compiler: clang
      env: COMPILER='ccache clang++' BUILD_TYPE='Release'

-
    - os: osx
-      osx_image: xcode7
+      osx_image: xcode8
      compiler: clang
      env: COMPILER='ccache clang++' BUILD_TYPE='Debug'

    - os: osx
-      osx_image: xcode7
+      osx_image: xcode8
      compiler: clang
      env: COMPILER='ccache clang++' BUILD_TYPE='Release'

@@ -149,7 +148,8 @@ install:
      mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
    elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew install cmake ccache
+      which cmake || brew install cmake 
+      which ccache || brew install ccache
    fi

 before_script:
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)

-*v1.5.7*
+*v1.5.8*

 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

--- a/include/internal/catch_common.hpp
+++ b/include/internal/catch_common.hpp
@@ -21,8 +21,11 @@ namespace Catch {
    bool contains( std::string const& s, std::string const& infix ) {
        return s.find( infix ) != std::string::npos;
    }
+    char toLowerCh(char c) {
+        return static_cast<char>( ::tolower( c ) );
+    }
    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), ::tolower );
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
    }
    std::string toLower( std::string const& s ) {
        std::string lc = s;
--- a/include/internal/catch_test_case_registry_impl.hpp
+++ b/include/internal/catch_test_case_registry_impl.hpp
@@ -24,9 +24,9 @@
 #endif

 namespace Catch {
-    
+
    struct RandomNumberGenerator {
-        typedef int result_type;
+        typedef std::ptrdiff_t result_type;

        result_type operator()( result_type n ) const { return std::rand() % n; }

--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -37,7 +37,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 5, 7, "", 0 );
+    Version libraryVersion( 1, 5, 8, "", 0 );

 }

--- a/include/reporters/catch_reporter_xml.hpp
+++ b/include/reporters/catch_reporter_xml.hpp
@@ -115,7 +115,7 @@ namespace Catch {
                        .writeText( assertionResult.getMessage() );
                    break;
                case ResultWas::FatalErrorCondition:
-                    m_xml.scopedElement( "Fatal Error Condition" )
+                    m_xml.scopedElement( "FatalErrorCondition" )
                        .writeAttribute( "filename", assertionResult.getSourceInfo().file )
                        .writeAttribute( "line", assertionResult.getSourceInfo().line )
                        .writeText( assertionResult.getMessage() );
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v1.5.7
- *  Generated: 2016-09-27 10:45:46.824849
+ *  Catch v1.5.8
+ *  Generated: 2016-10-26 12:07:30.938259
 *  ----------------------------------------------------------
 *  This file has been merged from multiple headers. Please don't edit it directly
 *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6461,7 +6461,7 @@ namespace Catch {
 namespace Catch {

    struct RandomNumberGenerator {
-        typedef int result_type;
+        typedef std::ptrdiff_t result_type;

        result_type operator()( result_type n ) const { return std::rand() % n; }

@@ -7578,7 +7578,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 5, 7, "", 0 );
+    Version libraryVersion( 1, 5, 8, "", 0 );

 }

@@ -7809,8 +7809,11 @@ namespace Catch {
    bool contains( std::string const& s, std::string const& infix ) {
        return s.find( infix ) != std::string::npos;
    }
+    char toLowerCh(char c) {
+        return static_cast<char>( ::tolower( c ) );
+    }
    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), ::tolower );
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
    }
    std::string toLower( std::string const& s ) {
        std::string lc = s;
@@ -9258,7 +9261,7 @@ namespace Catch {
                        .writeText( assertionResult.getMessage() );
                    break;
                case ResultWas::FatalErrorCondition:
-                    m_xml.scopedElement( "Fatal Error Condition" )
+                    m_xml.scopedElement( "FatalErrorCondition" )
                        .writeAttribute( "filename", assertionResult.getSourceInfo().file )
                        .writeAttribute( "line", assertionResult.getSourceInfo().line )
                        .writeText( assertionResult.getMessage() );
Author	SHA1	Message	Date
Phil Nash	e27c4ee042	Build 1.5.8	2016-10-26 12:08:26 +01:00
Phil Nash	072114293b	Merge branch 'BillyONeal-master'	2016-10-26 12:06:35 +01:00
Phil Nash	f90ee9fb37	Merge branch 'master' of https://github.com/BillyONeal/Catch into BillyONeal-master	2016-10-26 12:04:38 +01:00
Billy Robert O'Neal III	c17ba0870a	Fix transform without a lambda Catch apparently supports targeting C++03, so use an inline function instead.	2016-10-14 14:28:15 -07:00
Billy Robert O'Neal III	79f01100e3	Fix transform narrowing warnings Catch passes ::tolower into std::transform with string iterators. ::tolower has the signature int(int), which triggers a stealth narrowing warning inside std::transform, because transform calls _Dest = _Fn(_First), which implicitly narrows an int to a char. For this particular application the narrowing is fine, so explicitly narrow in a lambda.	2016-10-14 14:16:21 -07:00
Billy Robert O'Neal III	ccf7f2842a	Fix random_shuffle narrowing warnings Catch passes an RNG which accepts int to random_shuffle. Inside random_shuffle, the STL tries to call that RNG with the difference_type of the user provided iterators. For std::vector, this is ptrdiff_t, which on amd64 builds is wider than int. This triggers a narrowing warning because the 64 bit difference is being truncated to 32 bits. Note that this RNG implementation still does not produce a correctly uniformly shuffled result -- it's currently asserting that std::rand can produce 1000000 which is false -- but I don't know enough about how much repeatable shuffles are necessary here, so I'm leaving that alone for now.	2016-10-14 14:06:45 -07:00
Phil Nash	e0302db4a6	Rename element for Fatal Error Condition so it doesn't have spaces Fixes: #685	2016-10-14 18:45:08 +01:00
Phil Nash	88732e85b2	Merge pull request #716 from jbcoe/master Quick fix for failing travis builds on OS X	2016-10-04 15:57:10 +01:00
Phil Nash	1c9a6cab88	Removed XCode6 builds (which were erroring anyway) and added XCode8 builds	2016-09-27 11:20:33 +01:00
Jonathan B. Coe	fd7d35464b	quick fix for failing travis builds on os x	2016-09-24 19:38:43 +01:00