Skip to content

Commit 02af70e

Browse files
committed
build v1.3.6 (include's David Grayson's fix for the gcc pragma)
1 parent c362894 commit 02af70e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![catch logo](catch-logo-small.png)
22

3-
*v1.3.5*
3+
*v1.3.6*
44

55
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
66

include/internal/catch_version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Catch {
3737
return os;
3838
}
3939

40-
Version libraryVersion( 1, 3, 5, "", 0 );
40+
Version libraryVersion( 1, 3, 6, "", 0 );
4141

4242
}
4343

single_include/catch.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Catch v1.3.5
3-
* Generated: 2016-02-29 08:16:42.342094
2+
* Catch v1.3.6
3+
* Generated: 2016-03-11 18:30:42.852700
44
* ----------------------------------------------------------
55
* This file has been merged from multiple headers. Please don't edit it directly
66
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -149,7 +149,7 @@
149149
# endif
150150

151151
# if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) && defined(CATCH_CPP11_OR_GREATER)
152-
# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "gcc diagnostic ignored \"-Wparentheses\"" )
152+
# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS _Pragma( "GCC diagnostic ignored \"-Wparentheses\"" )
153153
# endif
154154

155155
// - otherwise more recent versions define __cplusplus >= 201103L
@@ -7481,7 +7481,7 @@ namespace Catch {
74817481
return os;
74827482
}
74837483

7484-
Version libraryVersion( 1, 3, 5, "", 0 );
7484+
Version libraryVersion( 1, 3, 6, "", 0 );
74857485

74867486
}
74877487

0 commit comments

Comments
 (0)