diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:58 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:58 -0800 |
| commit | ec826c5a592126ddb6b12b47e6e1fb6232ce340d (patch) | |
| tree | d5934719f3eea00b2ea639f2e37d00563a3e5cd5 /src | |
| parent | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (diff) | |
| parent | 39f577c38ec10b668408d4af3dacaec155a7f0c7 (diff) | |
Merge remote-tracking branch 'origin/3.5.x' into master
Diffstat (limited to 'src')
| -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 eccd0734..5ead98c8 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:". |