Merge pull request #4124 from pherl/nullptr

remove nullptr
7 years ago · 39f577c38e
parent 5b1caea024 4f3d8657c3
commit 39f577c38e
1 changed files with 1 additions and 1 deletions
--- 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:".