Merge pull request #8306 from chacha21:portability
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 3 Mar 2017 04:46:05 +0000 (04:46 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 3 Mar 2017 04:46:05 +0000 (04:46 +0000)
1  2 
modules/core/src/persistence.cpp

Simple merge