1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #14719 from alalek:update_protobuf_3.5.2

This commit is contained in:
Alexander Alekhin
2019-06-04 13:10:17 +00:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1,3 +1,3 @@
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
+1 -1
View File
@@ -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:".