From 0080704038530fc674c8b9b20c1741645ef65819 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Sun, 5 Feb 2017 12:13:42 +0900 Subject: [PATCH] Use wcslen() instead of std::wcslen() OS/2 kLIBC has wcslen(), but it is not in std namespace. Change-Id: I0b4fd6705e6ae938b2188abdc688eea3bba27430 --- third_party/googletest/README.libvpx | 2 ++ third_party/googletest/src/src/gtest-printers.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/third_party/googletest/README.libvpx b/third_party/googletest/README.libvpx index f4ca22b..9dc2a44 100644 --- a/third_party/googletest/README.libvpx +++ b/third_party/googletest/README.libvpx @@ -24,3 +24,5 @@ Local Modifications: - Make WithParamInterface::GetParam static in order to avoid initialization issues https://github.com/google/googletest/pull/1830 +- Use wcslen() instead of std::wcslen() + https://github.com/google/googletest/pull/1899 diff --git a/third_party/googletest/src/src/gtest-printers.cc b/third_party/googletest/src/src/gtest-printers.cc index d55a5e9..f9b274e 100644 --- a/third_party/googletest/src/src/gtest-printers.cc +++ b/third_party/googletest/src/src/gtest-printers.cc @@ -349,7 +349,7 @@ void PrintTo(const wchar_t* s, ostream* os) { *os << "NULL"; } else { *os << ImplicitCast_(s) << " pointing to "; - PrintCharsAsStringTo(s, std::wcslen(s), os); + PrintCharsAsStringTo(s, wcslen(s), os); } } #endif // wchar_t is native -- 2.7.4