summaryrefslogtreecommitdiffstats
path: root/googletest/include
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-03-21 20:31:31 (GMT)
committerGennadiy Civil <misterg@google.com>2018-03-21 20:31:31 (GMT)
commit691e38e518336fa8a9b51915735fe869edb24c08 (patch)
treeec9d6829582161e3c89b7f31a85b183da463058c /googletest/include
parentdccc2d67547a5a3a97e4f211f39df931c6fbd5d5 (diff)
downloadgoogletest-691e38e518336fa8a9b51915735fe869edb24c08.zip
googletest-691e38e518336fa8a9b51915735fe869edb24c08.tar.gz
googletest-691e38e518336fa8a9b51915735fe869edb24c08.tar.bz2
More merges
Diffstat (limited to 'googletest/include')
-rw-r--r--googletest/include/gtest/internal/gtest-port.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 3e4f7b5..53c1b5f 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -2675,7 +2675,8 @@ 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 StringFromGTestEnv(const char* flag, const char* default_val);
+std::string SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env();
+const char* StringFromGTestEnv(const char* flag, const char* default_val);
} // namespace internal
} // namespace testing