From 4d69b1607a876a77b8719f035b23254677617a47 Mon Sep 17 00:00:00 2001 From: kosak Date: Sun, 19 Jul 2015 21:50:45 +0000 Subject: GTEST_USE_OWN_FLAGFILE support --- include/gtest/internal/custom/gtest-port.h | 2 ++ include/gtest/internal/gtest-port.h | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'include/gtest') diff --git a/include/gtest/internal/custom/gtest-port.h b/include/gtest/internal/custom/gtest-port.h index b31810da..7e744bd3 100644 --- a/include/gtest/internal/custom/gtest-port.h +++ b/include/gtest/internal/custom/gtest-port.h @@ -32,6 +32,8 @@ // // Flag related macros: // GTEST_FLAG(flag_name) +// GTEST_USE_OWN_FLAGFILE_FLAG_ - Define to 0 when the system provides its +// own flagfile flag parsing. // GTEST_DECLARE_bool_(name) // GTEST_DECLARE_int32_(name) // GTEST_DECLARE_string_(name) diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 864a90cb..f6ed4d00 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -2434,6 +2434,10 @@ typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. # define GTEST_FLAG(name) FLAGS_gtest_##name #endif // !defined(GTEST_FLAG) +#if !defined(GTEST_USE_OWN_FLAGFILE_FLAG_) +# define GTEST_USE_OWN_FLAGFILE_FLAG_ 1 +#endif // !defined(GTEST_USE_OWN_FLAGFILE_FLAG_) + #if !defined(GTEST_DECLARE_bool_) # define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver -- cgit v1.2.3