diff options
| author | kosak <kosak@google.com> | 2015-07-14 22:44:39 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2015-07-14 22:44:39 +0000 |
| commit | 0928adbfea9b7645e884bd95fee23cfd669729cd (patch) | |
| tree | c248402689dcf4ec01c363b362f96b0e67013ad2 /include | |
| parent | 80167de7055d61ed54808995fb7d632781a5f70e (diff) | |
| download | googletest-0928adbfea9b7645e884bd95fee23cfd669729cd.tar.gz googletest-0928adbfea9b7645e884bd95fee23cfd669729cd.tar.bz2 googletest-0928adbfea9b7645e884bd95fee23cfd669729cd.zip | |
Move the selection of the flag saver implementation into gtest-port.h and
custom/gtest-port.h.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/gtest.h | 3 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 71d552e1..919df651 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -452,8 +452,7 @@ class GTEST_API_ Test { // internal method to avoid clashing with names used in user TESTs. void DeleteSelf_() { delete this; } - // Uses a GTestFlagSaver to save and restore all Google Test flags. - const internal::GTestFlagSaver* const gtest_flag_saver_; + const internal::scoped_ptr< GTEST_FLAG_SAVER_ > gtest_flag_saver_; // Often a user misspells SetUp() as Setup() and spends a long time // wondering why it is never called by Google Test. The declaration of diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 83fa75db..b3830c58 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -2418,6 +2418,8 @@ typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. #endif // !defined(GTEST_FLAG) #if !defined(GTEST_DECLARE_bool_) +# define GTEST_FLAG_SAVER_ ::testing::internal::GTestFlagSaver + // Macros for declaring flags. # define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name) # define GTEST_DECLARE_int32_(name) \ |