Date: Thu, 9 Apr 2020 02:01:00 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r359734 - vendor/google/googletest/dist/googletest/src Message-ID: <202004090201.039210lh075929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Apr 9 02:00:59 2020 New Revision: 359734 URL: https://svnweb.freebsd.org/changeset/base/359734 Log: Backport a -Wsign-compare fix for `ArrayAsVector` 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) Modified: vendor/google/googletest/dist/googletest/src/gtest.cc Modified: vendor/google/googletest/dist/googletest/src/gtest.cc ============================================================================== --- vendor/google/googletest/dist/googletest/src/gtest.cc Thu Apr 9 01:56:21 2020 (r359733) +++ vendor/google/googletest/dist/googletest/src/gtest.cc Thu Apr 9 02:00:59 2020 (r359734) @@ -2108,7 +2108,7 @@ static const char* const kReservedOutputTestCaseAttrib "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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004090201.039210lh075929>