Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
048330b1
Commit
048330b1
authored
Dec 22, 2016
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
⬆
Catch v1.5.9
parent
22a6b956
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
catch.hpp
test/thirdparty/catch/catch.hpp
+9
-5
No files found.
test/thirdparty/catch/catch.hpp
100644 → 100755
View file @
048330b1
/*
/*
* Catch v1.5.
8
* Catch v1.5.
9
* Generated: 2016-1
0-26 12:07:30.938259
* Generated: 2016-1
1-29 12:14:38.049276
* ----------------------------------------------------------
* ----------------------------------------------------------
* 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.
...
@@ -3428,6 +3428,7 @@ namespace Catch {
...
@@ -3428,6 +3428,7 @@ namespace Catch {
#include <streambuf>
#include <streambuf>
#include <ostream>
#include <ostream>
#include <fstream>
#include <fstream>
#include <memory>
namespace
Catch
{
namespace
Catch
{
...
@@ -3995,9 +3996,12 @@ namespace Clara {
...
@@ -3995,9 +3996,12 @@ namespace Clara {
inline
void
convertInto
(
std
::
string
const
&
_source
,
std
::
string
&
_dest
)
{
inline
void
convertInto
(
std
::
string
const
&
_source
,
std
::
string
&
_dest
)
{
_dest
=
_source
;
_dest
=
_source
;
}
}
char
toLowerCh
(
char
c
)
{
return
static_cast
<
char
>
(
::
tolower
(
c
)
);
}
inline
void
convertInto
(
std
::
string
const
&
_source
,
bool
&
_dest
)
{
inline
void
convertInto
(
std
::
string
const
&
_source
,
bool
&
_dest
)
{
std
::
string
sourceLC
=
_source
;
std
::
string
sourceLC
=
_source
;
std
::
transform
(
sourceLC
.
begin
(),
sourceLC
.
end
(),
sourceLC
.
begin
(),
::
tolower
);
std
::
transform
(
sourceLC
.
begin
(),
sourceLC
.
end
(),
sourceLC
.
begin
(),
toLowerCh
);
if
(
sourceLC
==
"y"
||
sourceLC
==
"1"
||
sourceLC
==
"true"
||
sourceLC
==
"yes"
||
sourceLC
==
"on"
)
if
(
sourceLC
==
"y"
||
sourceLC
==
"1"
||
sourceLC
==
"true"
||
sourceLC
==
"yes"
||
sourceLC
==
"on"
)
_dest
=
true
;
_dest
=
true
;
else
if
(
sourceLC
==
"n"
||
sourceLC
==
"0"
||
sourceLC
==
"false"
||
sourceLC
==
"no"
||
sourceLC
==
"off"
)
else
if
(
sourceLC
==
"n"
||
sourceLC
==
"0"
||
sourceLC
==
"false"
||
sourceLC
==
"no"
||
sourceLC
==
"off"
)
...
@@ -7578,7 +7582,7 @@ namespace Catch {
...
@@ -7578,7 +7582,7 @@ namespace Catch {
return
os
;
return
os
;
}
}
Version
libraryVersion
(
1
,
5
,
8
,
""
,
0
);
Version
libraryVersion
(
1
,
5
,
9
,
""
,
0
);
}
}
...
@@ -9166,6 +9170,7 @@ namespace Catch {
...
@@ -9166,6 +9170,7 @@ namespace Catch {
public
:
public
:
XmlReporter
(
ReporterConfig
const
&
_config
)
XmlReporter
(
ReporterConfig
const
&
_config
)
:
StreamingReporterBase
(
_config
),
:
StreamingReporterBase
(
_config
),
m_xml
(
_config
.
stream
()),
m_sectionDepth
(
0
)
m_sectionDepth
(
0
)
{
{
m_reporterPrefs
.
shouldRedirectStdOut
=
true
;
m_reporterPrefs
.
shouldRedirectStdOut
=
true
;
...
@@ -9185,7 +9190,6 @@ namespace Catch {
...
@@ -9185,7 +9190,6 @@ namespace Catch {
virtual
void
testRunStarting
(
TestRunInfo
const
&
testInfo
)
CATCH_OVERRIDE
{
virtual
void
testRunStarting
(
TestRunInfo
const
&
testInfo
)
CATCH_OVERRIDE
{
StreamingReporterBase
::
testRunStarting
(
testInfo
);
StreamingReporterBase
::
testRunStarting
(
testInfo
);
m_xml
.
setStream
(
stream
);
m_xml
.
startElement
(
"Catch"
);
m_xml
.
startElement
(
"Catch"
);
if
(
!
m_config
->
name
().
empty
()
)
if
(
!
m_config
->
name
().
empty
()
)
m_xml
.
writeAttribute
(
"name"
,
m_config
->
name
()
);
m_xml
.
writeAttribute
(
"name"
,
m_config
->
name
()
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment