diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-05 20:53:36 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-05 20:53:36 (GMT) |
| commit | 89d6f70f34a2bbde33158e1065d964222a7c296c (patch) | |
| tree | 2df33ca9cea3c507e6aed9ac4b6d15160d3fb685 /googletest/include | |
| parent | 617e2c5615780b1dd4a54c470d01ccb8de68e318 (diff) | |
| download | googletest-89d6f70f34a2bbde33158e1065d964222a7c296c.zip googletest-89d6f70f34a2bbde33158e1065d964222a7c296c.tar.gz googletest-89d6f70f34a2bbde33158e1065d964222a7c296c.tar.bz2 | |
merges-8refs/pull/1493/head
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 4d5aa04..97206be 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1537,14 +1537,18 @@ GTEST_API_ size_t GetFileSize(FILE* file); GTEST_API_ std::string ReadEntireFile(FILE* file); // All command line arguments. -GTEST_API_ const ::std::vector<testing::internal::string>& GetArgvs(); +GTEST_API_ std::vector<std::string> GetArgvs(); #if GTEST_HAS_DEATH_TEST -const ::std::vector<testing::internal::string>& GetInjectableArgvs(); -void SetInjectableArgvs(const ::std::vector<testing::internal::string>* - new_argvs); - +std::vector<std::string> GetInjectableArgvs(); +// Deprecated: pass the args vector by value instead. +void SetInjectableArgvs(const std::vector<std::string>* new_argvs); +void SetInjectableArgvs(const std::vector<std::string>& new_argvs); +#if GTEST_HAS_GLOBAL_STRING +void SetInjectableArgvs(const std::vector< ::string>& new_argvs); +#endif // GTEST_HAS_GLOBAL_STRING +void ClearInjectableArgvs(); #endif // GTEST_HAS_DEATH_TEST |