diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gtest-death-test.cc | 1 | ||||
-rw-r--r-- | src/gtest-internal-inl.h | 1 | ||||
-rw-r--r-- | src/gtest-port.cc | 1 | ||||
-rw-r--r-- | src/gtest.cc | 2 | ||||
-rw-r--r-- | src/gtest_main.cc | 5 |
5 files changed, 4 insertions, 6 deletions
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc index 0a0f83b5..36a2e3a7 100644 --- a/src/gtest-death-test.cc +++ b/src/gtest-death-test.cc @@ -913,6 +913,7 @@ class Arguments { char* const* Argv() { return &args_[0]; } + private: std::vector<char*> args_; }; diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index d869f0f6..1ea31a15 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -196,6 +196,7 @@ class GTestFlagSaver { GTEST_FLAG(stream_result_to) = stream_result_to_; GTEST_FLAG(throw_on_failure) = throw_on_failure_; } + private: // Fields for saving the original values of flags. bool also_run_disabled_tests_; diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 6e8dca29..9648eee8 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -514,7 +514,6 @@ class CapturedStream { public: // The ctor redirects the stream to a temporary file. CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) { - # if GTEST_OS_WINDOWS char temp_dir_path[MAX_PATH + 1] = { '\0' }; // NOLINT char temp_file_path[MAX_PATH + 1] = { '\0' }; // NOLINT diff --git a/src/gtest.cc b/src/gtest.cc index e407ee9b..f2e84af7 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -3864,7 +3864,6 @@ int UnitTest::Run() { // process. In either case the user does not want to see pop-up dialogs // about crashes - they are expected. if (impl()->catch_exceptions() || in_death_test_child_process) { - # if !GTEST_OS_WINDOWS_MOBILE // SetErrorMode doesn't exist on CE. SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT | @@ -3895,7 +3894,6 @@ int UnitTest::Run() { 0x0, // Clear the following flags: _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump. # endif - } #endif // GTEST_HAS_SEH diff --git a/src/gtest_main.cc b/src/gtest_main.cc index a09bbe0c..f3028225 100644 --- a/src/gtest_main.cc +++ b/src/gtest_main.cc @@ -27,13 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <iostream> +#include <stdio.h> #include "gtest/gtest.h" GTEST_API_ int main(int argc, char **argv) { - std::cout << "Running main() from gtest_main.cc\n"; - + printf("Running main() from gtest_main.cc\n"); testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } |