From 18abd8f51281461fe4f29cc0e7c18e9ed0888c9f Mon Sep 17 00:00:00 2001 From: Jae Heon Lee Date: Wed, 9 May 2018 13:03:57 -0700 Subject: Use NULL instead of nullptr, for pre-C++11 builds. --- googletest/src/gtest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 4fcd9b5..1b2aad2 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -5342,10 +5342,10 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { // Returns the most specific TestResult currently running. TestResult* UnitTestImpl::current_test_result() { - if (current_test_info_ != nullptr) { + if (current_test_info_ != NULL) { return ¤t_test_info_->result_; } - if (current_test_case_ != nullptr) { + if (current_test_case_ != NULL) { return ¤t_test_case_->ad_hoc_test_result_; } return &ad_hoc_test_result_; -- cgit v0.12