Skip to content

GitLab

Commit 18abd8f5 authored by Jae Heon Lee's avatar Jae Heon Lee
Browse files

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

parent ec5ad0f8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googletest/src/gtest.cc
View file @ 18abd8f5
...@@ -5342,10 +5342,10 @@ OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { ...@@ -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_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment