diff options
| author | vslashg <gfalcon@google.com> | 2020-03-17 17:20:07 -0400 |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2020-03-17 17:20:07 -0400 |
| commit | 3de76551e0f0e65b184f841a76088df86263a068 (patch) | |
| tree | 294690a703bb96adc96108d8af85ef9d3ebdb172 /googletest | |
| parent | 878bd92e0fef3f0afcd9adf7a1f75201a9ae9027 (diff) | |
| parent | 04e52ebe78166f0eb602dfc35817f91cc575cbfb (diff) | |
| download | googletest-3de76551e0f0e65b184f841a76088df86263a068.tar.gz googletest-3de76551e0f0e65b184f841a76088df86263a068.tar.bz2 googletest-3de76551e0f0e65b184f841a76088df86263a068.zip | |
Merge pull request #2722 from JohanMabille:warnings
PiperOrigin-RevId: 298608772
Diffstat (limited to 'googletest')
| -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 22592600..6911ad69 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2268,7 +2268,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); } |