mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14719 from alalek:update_protobuf_3.5.2

Browse Source
This commit is contained in:
Alexander Alekhin 2019-06-04 13:10:17 +00:00
commit fa96507fe7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/protobuf/README.md vendored
View File

@ -1,3 +1,3 @@
Project: Protocol Buffers - Google's data interchange format Project: Protocol Buffers - Google's data interchange format
Source code: https://github.com/google/protobuf Source code: https://github.com/protocolbuffers/protobuf
Version: 3.5.1 Version: 3.5.2

2
3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc vendored
View File

@ -91,7 +91,7 @@ struct CharTraits<wchar_t> {
template <typename char_type> template <typename char_type>
bool null_or_empty(const char_type* s) { 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:". // Returns true if the path starts with a drive letter, e.g. "c:".