Skip to content

Commit

Permalink
Update catch header
Browse files Browse the repository at this point in the history
Fixes #435. Updates catch header to fix include error on MacOS.
  • Loading branch information
jarro2783 committed Jul 15, 2024
1 parent 5965670 commit 2ad116a
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions test/catch.hpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Catch v2.13.10
* Generated: 2022-10-16 11:01:23.452308
* Catch v2.13.11
* Generated: 2024-07-15 17:08:27.065263
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
* Copyright (c) 2024 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)
Expand All @@ -15,7 +15,7 @@

#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 13
#define CATCH_VERSION_PATCH 10
#define CATCH_VERSION_PATCH 11

#ifdef __clang__
# pragma clang system_header
Expand Down Expand Up @@ -69,6 +69,9 @@
// See e.g.:
// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
#ifdef __APPLE__
# ifndef __has_extension
# define __has_extension(x) 0
# endif
# include <TargetConditionals.h>
# if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
(defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
Expand Down Expand Up @@ -2707,7 +2710,7 @@ namespace Catch {
INTERNAL_CATCH_TRY { \
CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); /* NOLINT(bugprone-chained-comparison) */ \
CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
} INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
INTERNAL_CATCH_REACT( catchAssertionHandler ) \
Expand Down Expand Up @@ -10171,7 +10174,10 @@ namespace {

#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////

#include <unistd.h>
#if defined( CATCH_PLATFORM_LINUX ) || defined( CATCH_PLATFORM_MAC )
# define CATCH_INTERNAL_HAS_ISATTY
# include <unistd.h>
#endif

namespace Catch {
namespace {
Expand Down Expand Up @@ -10220,7 +10226,8 @@ namespace {
#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
!isDebuggerActive() &&
#endif
#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
#if defined( CATCH_INTERNAL_HAS_ISATTY ) && \
!( defined( __DJGPP__ ) && defined( __STRICT_ANSI__ ) )
isatty(STDOUT_FILENO)
#else
false
Expand Down Expand Up @@ -15389,7 +15396,7 @@ namespace Catch {
}

Version const& libraryVersion() {
static Version version( 2, 13, 10, "", 0 );
static Version version( 2, 13, 11, "", 0 );
return version;
}

Expand Down

0 comments on commit 2ad116a

Please sign in to comment.