diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-04 22:28:05 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-05 16:54:14 (GMT) |
| commit | 4bb49ed640e34e23187ad7ea689693ef9927033f (patch) | |
| tree | 31bfca77d3e46134fddebe28118bcba3af711e45 /googletest/src/gtest-filepath.cc | |
| parent | f13bbe2992d188e834339abe6f715b2b2f840a77 (diff) | |
| download | googletest-4bb49ed640e34e23187ad7ea689693ef9927033f.zip googletest-4bb49ed640e34e23187ad7ea689693ef9927033f.tar.gz googletest-4bb49ed640e34e23187ad7ea689693ef9927033f.tar.bz2 | |
Apply clang-tidy modernize-use-nullptr to googletest.
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.
This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.
PiperOrigin-RevId: 215814400
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 a7e65c0..317d17c 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; } |