diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-12 13:03:01 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-13 09:27:22 -0800 |
commit | 7b01edd129ab2eb30c53a8dd458253d2f7ff1f59 (patch) | |
tree | 8f5f70ec7651de502d5c7935c86024e0e2b7a6f5 /meta-oe/recipes-test/catch2 | |
parent | e4c5c0da6bf3f0d8a171e8361e83c49760108277 (diff) | |
download | meta-openembedded-contrib-7b01edd129ab2eb30c53a8dd458253d2f7ff1f59.tar.gz |
catch2: Upgrade to 2.6.1
Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test/catch2')
-rw-r--r-- | meta-oe/recipes-test/catch2/catch2_2.6.1.bb (renamed from meta-oe/recipes-test/catch2/catch2_2.6.0.bb) | 5 | ||||
-rw-r--r-- | meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch | 35 |
2 files changed, 38 insertions, 2 deletions
diff --git a/meta-oe/recipes-test/catch2/catch2_2.6.0.bb b/meta-oe/recipes-test/catch2/catch2_2.6.1.bb index 13beb9e8b5..08d6616401 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.6.0.bb +++ b/meta-oe/recipes-test/catch2/catch2_2.6.1.bb @@ -6,9 +6,10 @@ 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.0 -SRCREV = "d75e9b3c0f24fe42553131873459611ed155e297" +# v2.6.1 +SRCREV = "dbbab8727c342733f75045483048cdcb52421e32" S = "${WORKDIR}/git" 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 new file mode 100644 index 0000000000..555c71ad22 --- /dev/null +++ b/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch @@ -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 + |