third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8306 from chacha21:portability

Browse Source
This commit is contained in:
Alexander Alekhin 2017-03-03 04:46:05 +00:00
commit 5d31d6ebbb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/persistence.cpp
View File

@ -67,6 +67,8 @@
# define _FILE_OFFSET_BITS 0
# endif
# include <zlib.h>
#else
typedef void* gzFile;
#endif
/****************************************************************************************\
@ -7686,7 +7688,7 @@ std::string base64::make_base64_header(const char * dt)
bool base64::read_base64_header(std::vector<char> const & header, std::string & dt)
{
std::istringstream iss(header.data());
return static_cast<bool>(iss >> dt);
return !!(iss >> dt);//the "std::basic_ios::operator bool" differs between C++98 and C++11. The "double not" syntax is portable and covers both cases with equivalent meaning
}
/****************************************************************************