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

Googletest: Adapt googletest 1.11.0 with gcc11

Browse Source 
Backport a commit to fix the build error when using gcc11.
[commit]
096014a45d
[error]
/usr/include/gtest/gtest-printers.h:291:36: error: no matching function for call to
‘testing::internal::internal_stream_operator_without_lexical_name_lookup::StreamPrinter::PrintValue(const A::B::C::D::E::F::G&, std::nullptr_t)’
291 |     T, decltype(Printer::PrintValue(std::declval<const T&>(), nullptr)),
    |                 ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/gtest/gtest-printers.h:214:15: note: candidate: ‘template<class T, class, class> static void testing::internal::internal_stream_operator_without_lexical_name_lookup::StreamPrinter::PrintValue(const T&, std::ostream*)’
  214 |   static void PrintValue(const T& value, ::std::ostream* os) {
      |               ^~~~~~~~~~

Signed-off-by: Peng Cui <peng.ca.cui@bmw.com>
Signed-off-by: Sana Kazi <sana.kazi@kpit.com>
Signed-off-by: Sana Kazi <sanakazisk19@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
sana kazi 2023-06-19 13:35:53 +05:30 committed by Armin Kuster
parent 5790310da3
commit 8fb1e24fcc
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-oe/recipes-test/googletest/files/0001-work-around-GCC-6-11-ADL-bug.patch Normal file
View File

@ -0,0 +1,42 @@
From 8c70e2680bec526012d96578160901e4c24e1c48 Mon Sep 17 00:00:00 2001
From: Paul Groke <paul.groke@dynatrace.com>
Date: Thu, 15 Sep 2022 13:36:49 +0200
Subject: [PATCH] work around GCC 6~11 ADL bug
see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51577
ADL seems to work properly when we do the SFINAE check via the return type, but not when using a dummy template parameter
fix #3992
Upstream-Status: Backport [https://github.com/google/googletest/pull/3993/commits/096014a45dc38dff993f5b7bb28a258d8323344b]
Signed-off-by: Paul Groke <paul.groke@dynatrace.com>
Signed-off-by: Sana Kazi <sana.kazi@kpit.com>
---
googletest/include/gtest/gtest-printers.h | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index 8e4d295344..19c3e0b69b 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -205,12 +205,13 @@ struct StreamPrinter {
// Don't accept member pointers here. We'd print them via implicit
// conversion to bool, which isn't useful.
typename = typename std::enable_if<
- !std::is_member_pointer<T>::value>::type,
- // Only accept types for which we can find a streaming operator via
- // ADL (possibly involving implicit conversions).
- typename = decltype(std::declval<std::ostream&>()
- << std::declval<const T&>())>
- static void PrintValue(const T& value, ::std::ostream* os) {
+ !std::is_member_pointer<T>::value>::type>
+ // Only accept types for which we can find a streaming operator via
+ // ADL (possibly involving implicit conversions).
+ // (Use SFINAE via return type, because it seems GCC < 12 doesn't handle name
+ // lookup properly when we do it in the template parameter list.)
+ static auto PrintValue(const T& value, ::std::ostream* os)
+ -> decltype((void)(*os << value)) {
// Call streaming operator found by ADL, possibly with implicit conversions
// of the arguments.
*os << value;
--
2.25.1

3
meta-oe/recipes-test/googletest/googletest_git.bb
View File

@ -10,7 +10,8 @@ PROVIDES += "gmock gtest"
S = "${WORKDIR}/git"
SRCREV = "9e712372214d75bb30ec2847a44bf124d48096f3"
SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https"
SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https \
file://0001-work-around-GCC-6-11-ADL-bug.patch "
inherit cmake