aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2020-04-09 02:00:59 +0000
committerEnji Cooper <ngie@FreeBSD.org>2020-04-09 02:00:59 +0000
commit1774e46c372e2c1e16d4bc78f81359605e15b1b6 (patch)
tree6aa021839527a671704916360f02470c24e672e7
parentcd024ff37bc5950173e4c7f34f7259d85825e810 (diff)
downloadsrc-1774e46c372e2c1e16d4bc78f81359605e15b1b6.tar.gz
src-1774e46c372e2c1e16d4bc78f81359605e15b1b6.zip
Backport a -Wsign-compare fix for `ArrayAsVector`vendor/google/googletest
This fixes the build with newer versions of gcc. Obtained from: [google/googletest#2723](https://github.com/google/googletest/pull/2723) Submitted-by: [Johan Mabille](https://github.com/JohanMabille)
Notes
Notes: svn path=/vendor/google/googletest/dist/; revision=359734
-rw-r--r--googletest/src/gtest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index a5b4e5ac78ca..69f25e6890e5 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2108,7 +2108,7 @@ static const char* const kReservedOutputTestCaseAttributes[] = {
"classname", "name", "status", "time", "type_param",
"value_param", "file", "line", "result", "timestamp"};
-template <int kSize>
+template <size_t kSize>
std::vector<std::string> ArrayAsVector(const char* const (&array)[kSize]) {
return std::vector<std::string>(array, array + kSize);
}