diff options
| author | Jisi Liu <liujisi@google.com> | 2018-01-03 09:20:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 09:20:23 -0800 |
| commit | 39f577c38ec10b668408d4af3dacaec155a7f0c7 (patch) | |
| tree | 4558a12fab1f59997557b5b414878662f318dc2f | |
| parent | 5b1caea024138236451d60d9df5416253f648fb1 (diff) | |
| parent | 4f3d8657c3914e5f2d5aa992e26f3e5c09326b84 (diff) | |
| download | protobuf-39f577c38ec10b668408d4af3dacaec155a7f0c7.tar.gz protobuf-39f577c38ec10b668408d4af3dacaec155a7f0c7.tar.bz2 protobuf-39f577c38ec10b668408d4af3dacaec155a7f0c7.zip | |
Merge pull request #4124 from pherl/nullptr
remove nullptr
| -rw-r--r-- | src/google/protobuf/stubs/io_win32.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index ad2d2d26..b59b8e48 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc @@ -91,7 +91,7 @@ struct CharTraits<wchar_t> { template <typename char_type> bool null_or_empty(const char_type* s) { - return s == nullptr || *s == 0; + return s == NULL || *s == 0; } // Returns true if the path starts with a drive letter, e.g. "c:". |