diff options
author | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
commit | 0f6567954f42767e2f4a92d9f3b4afa679a65c16 (patch) | |
tree | 1ff54fc4be37e36266e39f9dfe9b075fae6c96dd /googletest/include | |
parent | 691e38e518336fa8a9b51915735fe869edb24c08 (diff) | |
download | googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz |
more merges
Diffstat (limited to 'googletest/include')
-rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 53c1b5f4..751e1764 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2675,7 +2675,7 @@ 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); -std::string SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env(); +std::string OutputFlagAlsoCheckEnvVar(); const char* StringFromGTestEnv(const char* flag, const char* default_val); } // namespace internal |