From bb2941fcc611b9e4eaf16f156e8c723348bf0931 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 11 May 2023 08:27:42 -0700 Subject: [PATCH] Give CreateArgvFromArgs internal linkage It isn't declared in any header or referenced from any other file. PiperOrigin-RevId: 531209642 Change-Id: I9e7df37f737b00994f8845ed38c3b775879cb25c --- googletest/src/gtest-death-test.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index c3b7820e..4cf78e71 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -625,9 +625,11 @@ bool DeathTestImpl::Passed(bool status_ok) { return success; } +#ifndef GTEST_OS_WINDOWS // Note: The return value points into args, so the return value's lifetime is // bound to that of args. -std::unique_ptr CreateArgvFromArgs(std::vector& args) { +static std::unique_ptr CreateArgvFromArgs( + std::vector& args) { auto result = std::make_unique(args.size() + 1); for (size_t i = 0; i < args.size(); ++i) { result[i] = &args[i][0]; @@ -635,6 +637,7 @@ std::unique_ptr CreateArgvFromArgs(std::vector& args) { result[args.size()] = nullptr; // extra null terminator return result; } +#endif #ifdef GTEST_OS_WINDOWS // WindowsDeathTest implements death tests on Windows. Due to the