More merges

This commit is contained in:
Gennadiy Civil
2018-03-21 16:31:31 -04:00
parent dccc2d6754
commit 691e38e518
3 changed files with 35 additions and 28 deletions

View File

@@ -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