mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Merge ../../Catch
This commit is contained in:
commit
e88434067c
@ -29,6 +29,10 @@
|
|||||||
#include "internal/catch_interfaces_exception.h"
|
#include "internal/catch_interfaces_exception.h"
|
||||||
#include "internal/catch_approx.hpp"
|
#include "internal/catch_approx.hpp"
|
||||||
|
|
||||||
|
#ifdef __OBJC__
|
||||||
|
#include "internal/catch_objc.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
|
#if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
|
||||||
#include "catch_runner.hpp"
|
#include "catch_runner.hpp"
|
||||||
#endif
|
#endif
|
||||||
@ -37,10 +41,6 @@
|
|||||||
#include "internal/catch_default_main.hpp"
|
#include "internal/catch_default_main.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __OBJC__
|
|
||||||
#include "internal/catch_objc.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//////
|
//////
|
||||||
|
|
||||||
#define REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, false, true, "REQUIRE" )
|
#define REQUIRE( expr ) INTERNAL_CATCH_TEST( expr, false, true, "REQUIRE" )
|
||||||
|
Loading…
Reference in New Issue
Block a user