diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-19 21:50:45 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-19 21:50:45 +0000 |
| commit | de011a432c19b67c65230fc3d453093e7b403069 (patch) | |
| tree | 1e1f5ae5530c54691c7c485869fda2ca5c42473b /include | |
| parent | 6c9ae8ed3fb146961974a0a81e57e0baeafde9f7 (diff) | |
| download | googletest-de011a432c19b67c65230fc3d453093e7b403069.tar.gz | |
GTEST_USE_OWN_FLAGFILE support
git-svn-id: http://googletest.googlecode.com/svn/trunk@729 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/custom/gtest-port.h | 2 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/gtest/internal/custom/gtest-port.h b/include/gtest/internal/custom/gtest-port.h index b31810d..7e744bd 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 864a90c..f6ed4d0 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 |