summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Soffer <804265+asoffer@users.noreply.github.com>2020-03-03 09:44:53 -0500
committerGitHub <noreply@github.com>2020-03-03 09:44:53 -0500
commit6a7ed316a5cdc07b6d26362c90770787513822d4 (patch)
tree1eb3292e40e7a14ab416cb53ccb12f25607e8525
parent703bd9caab50b139428cea1aaff9974ebee5742e (diff)
parent04e52ebe78166f0eb602dfc35817f91cc575cbfb (diff)
downloadgoogletest-git-6a7ed316a5cdc07b6d26362c90770787513822d4.tar.gz
Merge pull request #2723 from JohanMabille/warningsv1.10.x
Fixed warnings
-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 a5b4e5ac..69f25e68 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);
}