diff options
| author | Andy Soffer <804265+asoffer@users.noreply.github.com> | 2020-03-03 14:44:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 14:44:53 (GMT) |
| commit | 6a7ed316a5cdc07b6d26362c90770787513822d4 (patch) | |
| tree | 1eb3292e40e7a14ab416cb53ccb12f25607e8525 | |
| parent | 703bd9caab50b139428cea1aaff9974ebee5742e (diff) | |
| parent | 04e52ebe78166f0eb602dfc35817f91cc575cbfb (diff) | |
| download | googletest-6a7ed316a5cdc07b6d26362c90770787513822d4.zip googletest-6a7ed316a5cdc07b6d26362c90770787513822d4.tar.gz googletest-6a7ed316a5cdc07b6d26362c90770787513822d4.tar.bz2 | |
Merge pull request #2723 from JohanMabille/warningsrefs/pull/4429/headrefs/pull/3528/headrefs/pull/3481/headrefs/pull/3080/headrefs/pull/3033/headv1.10.x
Fixed warnings
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index a5b4e5a..69f25e6 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); } |