Commit fa96507f authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #14719 from alalek:update_protobuf_3.5.2

parents 9802b4e1 1febb129
Project: Protocol Buffers - Google's data interchange format
Source code: https://github.com/google/protobuf
Version: 3.5.1
Source code: https://github.com/protocolbuffers/protobuf
Version: 3.5.2
......@@ -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:".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment