diff options
| author | Jae Heon Lee <jaeheonlee@google.com> | 2018-05-09 20:03:57 (GMT) |
|---|---|---|
| committer | Jae Heon Lee <jaeheonlee@google.com> | 2018-05-09 20:03:57 (GMT) |
| commit | 18abd8f51281461fe4f29cc0e7c18e9ed0888c9f (patch) | |
| tree | 1be2912bc49bc7d11ae1e9be65719ac700de413d /googletest | |
| parent | ec5ad0f8698881ea99b2fcda8c244b876b334afe (diff) | |
| download | googletest-18abd8f51281461fe4f29cc0e7c18e9ed0888c9f.zip googletest-18abd8f51281461fe4f29cc0e7c18e9ed0888c9f.tar.gz googletest-18abd8f51281461fe4f29cc0e7c18e9ed0888c9f.tar.bz2 | |
Use NULL instead of nullptr, for pre-C++11 builds.refs/pull/1597/head
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files 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_; |