From 0928adbfea9b7645e884bd95fee23cfd669729cd Mon Sep 17 00:00:00 2001 From: kosak Date: Tue, 14 Jul 2015 22:44:39 +0000 Subject: Move the selection of the flag saver implementation into gtest-port.h and custom/gtest-port.h. --- src/gtest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gtest.cc b/src/gtest.cc index 6dea6c6a..bb00879d 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -2179,14 +2179,15 @@ int TestResult::test_property_count() const { // Creates a Test object. -// The c'tor saves the values of all Google Test flags. +// The c'tor saves the states of all flags. Test::Test() - : gtest_flag_saver_(new internal::GTestFlagSaver) { + : gtest_flag_saver_(new GTEST_FLAG_SAVER_) { } -// The d'tor restores the values of all Google Test flags. +// The d'tor restores the states of all flags. The actual work is +// done by the d'tor of the gtest_flag_saver_ field, and thus not +// visible here. Test::~Test() { - delete gtest_flag_saver_; } // Sets up the test fixture. -- cgit v1.2.3