Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5d31d6eb
Commit
5d31d6eb
authored
Mar 03, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8306 from chacha21:portability
parents
8e8da3f5
74abbd08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
persistence.cpp
modules/core/src/persistence.cpp
+3
-1
No files found.
modules/core/src/persistence.cpp
View file @
5d31d6eb
...
...
@@ -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
}
/****************************************************************************
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment