mirror of https://github.com/catchorg/Catch2.git
Separated out catch_platform.h
This commit is contained in:
parent
46118714b1
commit
638cf9feb4
|
@ -12,13 +12,7 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
|
#include "catch_platform.h"
|
||||||
#define CATCH_PLATFORM_MAC
|
|
||||||
#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
|
|
||||||
#define CATCH_PLATFORM_IPHONE
|
|
||||||
#elif defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
|
|
||||||
#define CATCH_PLATFORM_WINDOWS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CATCH_PLATFORM_MAC
|
#ifdef CATCH_PLATFORM_MAC
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
/*
|
||||||
|
* Created by Phil on 16/8/2013.
|
||||||
|
* Copyright 2013 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)
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#ifndef TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
|
||||||
|
#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
|
||||||
|
|
||||||
|
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
|
||||||
|
#define CATCH_PLATFORM_MAC
|
||||||
|
#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
|
||||||
|
#define CATCH_PLATFORM_IPHONE
|
||||||
|
#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
|
||||||
|
#define CATCH_PLATFORM_WINDOWS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
|
|
@ -8,7 +8,9 @@
|
||||||
#ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
#ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
||||||
#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
|
||||||
|
|
||||||
#ifdef WIN32
|
#include "catch_platform.h"
|
||||||
|
|
||||||
|
#ifdef CATCH_PLATFORM_WINDOWS
|
||||||
typedef unsigned long long uint64_t;
|
typedef unsigned long long uint64_t;
|
||||||
#else
|
#else
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
|
@ -7,13 +7,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "catch_timer.h"
|
#include "catch_timer.h"
|
||||||
|
#include "catch_platform.h"
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#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>
|
||||||
|
@ -22,7 +23,7 @@
|
||||||
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) {
|
||||||
|
|
|
@ -73,6 +73,7 @@
|
||||||
26948284179A9AB900ED166E /* SectionTrackerTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SectionTrackerTests.cpp; path = ../../../SelfTest/SectionTrackerTests.cpp; sourceTree = "<group>"; };
|
26948284179A9AB900ED166E /* SectionTrackerTests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SectionTrackerTests.cpp; path = ../../../SelfTest/SectionTrackerTests.cpp; sourceTree = "<group>"; };
|
||||||
26948287179EF7F900ED166E /* catch_test_case_tracker.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_tracker.hpp; sourceTree = "<group>"; };
|
26948287179EF7F900ED166E /* catch_test_case_tracker.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_tracker.hpp; sourceTree = "<group>"; };
|
||||||
2694A1FB16A0000E004816E3 /* catch_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_text.cpp; sourceTree = "<group>"; };
|
2694A1FB16A0000E004816E3 /* catch_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_text.cpp; sourceTree = "<group>"; };
|
||||||
|
26AEAF1617BEA18E009E32C9 /* catch_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_platform.h; sourceTree = "<group>"; };
|
||||||
26C5F3EC17514B970056FB3C /* clara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = clara.h; path = ../../../../include/internal/clara.h; sourceTree = "<group>"; };
|
26C5F3EC17514B970056FB3C /* clara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = clara.h; path = ../../../../include/internal/clara.h; sourceTree = "<group>"; };
|
||||||
26DACF2F17206D3400A21326 /* catch_text.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_text.h; sourceTree = "<group>"; };
|
26DACF2F17206D3400A21326 /* catch_text.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_text.h; sourceTree = "<group>"; };
|
||||||
4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
|
4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
|
||||||
|
@ -425,6 +426,7 @@
|
||||||
26759473171C74C200A84BD1 /* catch_compiler_capabilities.h */,
|
26759473171C74C200A84BD1 /* catch_compiler_capabilities.h */,
|
||||||
26DACF2F17206D3400A21326 /* catch_text.h */,
|
26DACF2F17206D3400A21326 /* catch_text.h */,
|
||||||
263FD06117AF8DF200988A20 /* catch_timer.h */,
|
263FD06117AF8DF200988A20 /* catch_timer.h */,
|
||||||
|
26AEAF1617BEA18E009E32C9 /* catch_platform.h */,
|
||||||
);
|
);
|
||||||
name = Infrastructure;
|
name = Infrastructure;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
|
Loading…
Reference in New Issue