eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use NULL instead of nullptr, for pre-C++11 builds.

Browse Source
This commit is contained in:
Jae Heon Lee 2018-05-09 13:03:57 -07:00
parent ec5ad0f869
commit 18abd8f512
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/src/gtest.cc
View File

@ -5342,10 +5342,10 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() {
// Returns the most specific TestResult currently running. // Returns the most specific TestResult currently running.
TestResult* UnitTestImpl::current_test_result() { TestResult* UnitTestImpl::current_test_result() {
if (current_test_info_ != nullptr) { if (current_test_info_ != NULL) {
return &current_test_info_->result_; return &current_test_info_->result_;
} }
if (current_test_case_ != nullptr) { if (current_test_case_ != NULL) {
return &current_test_case_->ad_hoc_test_result_; return &current_test_case_->ad_hoc_test_result_;
} }
return &ad_hoc_test_result_; return &ad_hoc_test_result_;