From 4d69b1607a876a77b8719f035b23254677617a47 Mon Sep 17 00:00:00 2001
From: kosak <kosak@google.com>
Date: Sun, 19 Jul 2015 21:50:45 +0000
Subject: GTEST_USE_OWN_FLAGFILE support

---
 src/gtest.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/gtest.cc b/src/gtest.cc
index 1c5117d3..08393897 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -296,10 +296,12 @@ GTEST_DEFINE_bool_(
     "if exceptions are enabled or exit the program with a non-zero code "
     "otherwise.");
 
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
 GTEST_DEFINE_string_(
     flagfile,
     internal::StringFromGTestEnv("flagfile", ""),
     "This flag specifies the flagfile to read command-line flags from.");
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
 
 namespace internal {
 
@@ -5233,6 +5235,7 @@ bool ParseGoogleTestFlag(const char* const arg) {
                     &GTEST_FLAG(throw_on_failure));
 }
 
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
 void LoadFlagsFromFile(const std::string& path) {
   FILE* flagfile = posix::FOpen(path.c_str(), "r");
   if (!flagfile) {
@@ -5253,6 +5256,7 @@ void LoadFlagsFromFile(const std::string& path) {
       g_help_flag = true;
   }
 }
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
 
 // Parses the command line for Google Test flags, without initializing
 // other parts of Google Test.  The type parameter CharType can be
@@ -5270,9 +5274,11 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
     bool remove_flag = false;
     if (ParseGoogleTestFlag(arg)) {
       remove_flag = true;
+#if GTEST_USE_OWN_FLAGFILE_FLAG_
     } else if (ParseStringFlag(arg, kFlagfileFlag, &GTEST_FLAG(flagfile))) {
       LoadFlagsFromFile(GTEST_FLAG(flagfile));
       remove_flag = true;
+#endif  // GTEST_USE_OWN_FLAGFILE_FLAG_
     } else if (arg_string == "--help" || arg_string == "-h" ||
                arg_string == "-?" || arg_string == "/?" ||
                HasGoogleTestFlagPrefix(arg)) {
-- 
cgit v1.2.3