CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

catch2: Upgrade 2.6.1 -> 2.7.2

Browse Source 
Remove patch applied upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Adrian Bunk 2019-05-10 14:55:15 +03:00 committed by Khem Raj
parent a62d135661
commit b250fe8002
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-oe/recipes-test/catch2/catch2_2.6.1.bb → meta-oe/recipes-test/catch2/catch2_2.7.2.bb
View File

@ -6,10 +6,9 @@ LICENSE = "BSL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
SRC_URI = "git://github.com/catchorg/Catch2.git \
file://0001-Fix-Wdefaulted-function-deleted-warning.patch \
"
# v2.6.1
SRCREV = "dbbab8727c342733f75045483048cdcb52421e32"
# v2.7.2
SRCREV = "7c37501b070c0e9ea9cdedbeac2059f0a6b0a8ab"
S = "${WORKDIR}/git"

35
meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch
View File

@ -1,35 +0,0 @@
From a39e0eaa8318335260967ffd1d16388eb5a1d6d8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 12 Feb 2019 12:57:00 -0800
Subject: [PATCH] Fix -Wdefaulted-function-deleted warning
Clang8 warns
catch_interfaces_reporter.h:84:25: error: explicitly defaulted move assignment operator is implicitly deleted [-Werror,-Wdefaulted-function-deleted]
| AssertionStats& operator = ( AssertionStats && ) = default;
| ^
Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1537]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/internal/catch_interfaces_reporter.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index 9d99c981..e5fbf8bb 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -80,8 +80,8 @@ namespace Catch {
AssertionStats( AssertionStats const& ) = default;
AssertionStats( AssertionStats && ) = default;
- AssertionStats& operator = ( AssertionStats const& ) = default;
- AssertionStats& operator = ( AssertionStats && ) = default;
+ AssertionStats& operator = ( AssertionStats const& ) = delete;
+ AssertionStats& operator = ( AssertionStats && ) = delete;
virtual ~AssertionStats();
AssertionResult assertionResult;
--
2.20.1