diff options
Diffstat (limited to 'googletest/src/gtest-filepath.cc')
| -rw-r--r-- | googletest/src/gtest-filepath.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index a7e65c08..317d17c3 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -111,7 +111,7 @@ FilePath FilePath::GetCurrentDir() { // however, so fallback only when failure is detected. return FilePath(result == NULL ? kCurrentDirectoryString : cwd); # endif // GTEST_OS_NACL - return FilePath(result == NULL ? "" : cwd); + return FilePath(result == nullptr ? "" : cwd); #endif // GTEST_OS_WINDOWS_MOBILE } @@ -352,7 +352,7 @@ FilePath FilePath::RemoveTrailingPathSeparator() const { // redundancies that might be in a pathname involving "." or "..". // FIXME: handle Windows network shares (e.g. \\server\share). void FilePath::Normalize() { - if (pathname_.c_str() == NULL) { + if (pathname_.c_str() == nullptr) { pathname_ = ""; return; } |
