Commit 5d31d6eb authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #8306 from chacha21:portability

parents 8e8da3f5 74abbd08
...@@ -67,6 +67,8 @@ ...@@ -67,6 +67,8 @@
# define _FILE_OFFSET_BITS 0 # define _FILE_OFFSET_BITS 0
# endif # endif
# include <zlib.h> # include <zlib.h>
#else
typedef void* gzFile;
#endif #endif
/****************************************************************************************\ /****************************************************************************************\
...@@ -7686,7 +7688,7 @@ std::string base64::make_base64_header(const char * dt) ...@@ -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) bool base64::read_base64_header(std::vector<char> const & header, std::string & dt)
{ {
std::istringstream iss(header.data()); 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
} }
/**************************************************************************** /****************************************************************************
......
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