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

18abd8f5 · Jae Heon Lee · ec5ad0f8 · 18abd8f5
Commit 18abd8f5 authored May 09, 2018 by Jae Heon Lee
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

googletest/src/gtest.cc googletest/src/gtest.cc +2 -2

No files found.
--- 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 &current_test_info_->result_;
  }
-  if (current_test_case_ != nullptr) {
+  if (current_test_case_ != NULL) {
    return &current_test_case_->ad_hoc_test_result_;
  }
  return &ad_hoc_test_result_;