diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-03-15 22:20:27 (GMT) |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-03-15 22:20:27 (GMT) |
| commit | 72416fab75f0245525cdcaa6843b672f6764ddca (patch) | |
| tree | ac22ccf18a47c573b3d173896408ab3d293578d9 /googletest/include | |
| parent | eba17963107837f6a408bdafa32da5276b9f71e6 (diff) | |
| parent | d23cf2b1570122cdcd7dd5b4edaa614792417763 (diff) | |
| download | googletest-72416fab75f0245525cdcaa6843b672f6764ddca.zip googletest-72416fab75f0245525cdcaa6843b672f6764ddca.tar.gz googletest-72416fab75f0245525cdcaa6843b672f6764ddca.tar.bz2 | |
Merge pull request #724 from duggelz/master
Read Bazel's $XML_OUTPUT_FILE environment variable
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 7d6e465..0094ed5 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2546,10 +2546,9 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value); // corresponding to the given Google Test flag. bool BoolFromGTestEnv(const char* flag, bool default_val); GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val); -const char* StringFromGTestEnv(const char* flag, const char* default_val); +std::string StringFromGTestEnv(const char* flag, const char* default_val); } // namespace internal } // namespace testing #endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ - |