Skip to content
Snippets Groups Projects
Commit d4fe0ff1 authored by Bernhard Rosenkränzer's avatar Bernhard Rosenkränzer
Browse files

Fix googletest to build with gcc 11.1


Googletest doesn't compile with gcc 11.1 because it doesn't explicitly
include <string> -- this is included implicitly (dependency of other
headers) by older libstdc++ as well as libc++

Signed-off-by: default avatarBernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
parent 752d39c3
No related branches found
No related tags found
No related merge requests found
diff -up git/googletest/include/gtest/hwext/gtest-tag.h.omv~ git/googletest/include/gtest/hwext/gtest-tag.h
--- git/googletest/include/gtest/hwext/gtest-tag.h.omv~ 2021-07-06 19:01:12.828013607 +0200
+++ git/googletest/include/gtest/hwext/gtest-tag.h 2021-07-06 19:01:24.291492486 +0200
@@ -3,7 +3,8 @@
#ifndef GTEST_INCLUDE_GTEST_GTEST_TAG_H_
#define GTEST_INCLUDE_GTEST_GTEST_TAG_H_
-#include <string.h>
+#include <string>
+#include <cstring>
#include <map>
#include <vector>
...@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ ...@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
file://googlemock/scripts/generator/LICENSE;md5=2c0b90db7465231447cf2dd2e8163333 \ file://googlemock/scripts/generator/LICENSE;md5=2c0b90db7465231447cf2dd2e8163333 \
file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/third_party_googletest.git;protocol=https;branch=ostc-next" SRC_URI = "git://git.ostc-eu.org/OSTC/OHOS/components/staging/third_party_googletest.git;protocol=https;branch=ostc-next \
file://googletest-gcc-11.patch"
SRCREV = "54337710388898ae818bbc2c0e0457c9b86e335e" SRCREV = "54337710388898ae818bbc2c0e0457c9b86e335e"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "0.0+git${SRCPV}" PV = "0.0+git${SRCPV}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment