3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Regen single header

This commit is contained in:
Phil Nash 2013-08-16 19:09:09 +01:00
parent 638cf9feb4
commit 04a3364b5a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* CATCH v1.0 build 8 (master branch) * CATCH v1.0 build 8 (master branch)
* Generated: 2013-08-16 18:58:15.279754 * Generated: 2013-08-16 19:08:52.941769
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -1436,11 +1436,14 @@ namespace Catch {
#include <iostream> #include <iostream>
// #included from: catch_platform.h
#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
#define CATCH_PLATFORM_MAC #define CATCH_PLATFORM_MAC
#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) #elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#define CATCH_PLATFORM_IPHONE #define CATCH_PLATFORM_IPHONE
#elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) #elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
#define CATCH_PLATFORM_WINDOWS #define CATCH_PLATFORM_WINDOWS
#endif #endif
@ -2916,7 +2919,7 @@ struct TestFailureException{};
// #included from: catch_timer.h // #included from: catch_timer.h
#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED #define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
#ifdef WIN32 #ifdef CATCH_PLATFORM_WINDOWS
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#else #else
#include <stdint.h> #include <stdint.h>
@ -6575,7 +6578,7 @@ namespace Catch
#pragma clang diagnostic ignored "-Wc++11-long-long" #pragma clang diagnostic ignored "-Wc++11-long-long"
#endif #endif
#ifdef WIN32 #ifdef CATCH_PLATFORM_WINDOWS
#include <windows.h> #include <windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
@ -6584,7 +6587,7 @@ namespace Catch
namespace Catch { namespace Catch {
namespace { namespace {
#ifdef WIN32 #ifdef CATCH_PLATFORM_WINDOWS
uint64_t getCurrentTicks() { uint64_t getCurrentTicks() {
static uint64_t hz=0, hzo=0; static uint64_t hz=0, hzo=0;
if (!hz) { if (!hz) {