diff options
Diffstat (limited to 'meta-oe/recipes-test/catch2')
-rw-r--r-- | meta-oe/recipes-test/catch2/catch2_2.7.2.bb (renamed from meta-oe/recipes-test/catch2/catch2_2.6.1.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch | 35 |
2 files changed, 2 insertions, 38 deletions
diff --git a/meta-oe/recipes-test/catch2/catch2_2.6.1.bb b/meta-oe/recipes-test/catch2/catch2_2.7.2.bb index 08d661640..b5c857329 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.6.1.bb +++ b/meta-oe/recipes-test/catch2/catch2_2.7.2.bb | |||
@@ -6,10 +6,9 @@ LICENSE = "BSL-1.0" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/catchorg/Catch2.git \ | 8 | SRC_URI = "git://github.com/catchorg/Catch2.git \ |
9 | file://0001-Fix-Wdefaulted-function-deleted-warning.patch \ | ||
10 | " | 9 | " |
11 | # v2.6.1 | 10 | # v2.7.2 |
12 | SRCREV = "dbbab8727c342733f75045483048cdcb52421e32" | 11 | SRCREV = "7c37501b070c0e9ea9cdedbeac2059f0a6b0a8ab" |
13 | 12 | ||
14 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
15 | 14 | ||
diff --git a/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch b/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch deleted file mode 100644 index 555c71ad2..000000000 --- a/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From a39e0eaa8318335260967ffd1d16388eb5a1d6d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 12 Feb 2019 12:57:00 -0800 | ||
4 | Subject: [PATCH] Fix -Wdefaulted-function-deleted warning | ||
5 | |||
6 | Clang8 warns | ||
7 | |||
8 | catch_interfaces_reporter.h:84:25: error: explicitly defaulted move assignment operator is implicitly deleted [-Werror,-Wdefaulted-function-deleted] | ||
9 | | AssertionStats& operator = ( AssertionStats && ) = default; | ||
10 | | ^ | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1537] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | include/internal/catch_interfaces_reporter.h | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h | ||
19 | index 9d99c981..e5fbf8bb 100644 | ||
20 | --- a/include/internal/catch_interfaces_reporter.h | ||
21 | +++ b/include/internal/catch_interfaces_reporter.h | ||
22 | @@ -80,8 +80,8 @@ namespace Catch { | ||
23 | |||
24 | AssertionStats( AssertionStats const& ) = default; | ||
25 | AssertionStats( AssertionStats && ) = default; | ||
26 | - AssertionStats& operator = ( AssertionStats const& ) = default; | ||
27 | - AssertionStats& operator = ( AssertionStats && ) = default; | ||
28 | + AssertionStats& operator = ( AssertionStats const& ) = delete; | ||
29 | + AssertionStats& operator = ( AssertionStats && ) = delete; | ||
30 | virtual ~AssertionStats(); | ||
31 | |||
32 | AssertionResult assertionResult; | ||
33 | -- | ||
34 | 2.20.1 | ||
35 | |||