mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
catch2: Upgrade to 2.6.1
Fix build with clang Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+3
-2
@@ -6,9 +6,10 @@ LICENSE = "BSL-1.0"
|
|||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/catchorg/Catch2.git \
|
SRC_URI = "git://github.com/catchorg/Catch2.git \
|
||||||
|
file://0001-Fix-Wdefaulted-function-deleted-warning.patch \
|
||||||
"
|
"
|
||||||
# v2.6.0
|
# v2.6.1
|
||||||
SRCREV = "d75e9b3c0f24fe42553131873459611ed155e297"
|
SRCREV = "dbbab8727c342733f75045483048cdcb52421e32"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
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
|
||||||
|
|
||||||
Reference in New Issue
Block a user