RPCS3/cereal
1
0
Fork 0
mirror of https://github.com/RPCS3/cereal.git synced 2024-11-26 20:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare for removal of gh-pages-develop branch

Browse Source
This commit is contained in:
Shane Grant 2019-10-12 19:41:34 -07:00
parent 946b568bf7
commit f64864fa74
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/cereal/types/memory.hpp
View File

@ -152,7 +152,8 @@ namespace cereal
{
if( !itsRestored )
{
std::memcpy( itsPtr, &itsState, sizeof(ParentType) );
// void * cast needed when type has no trivial copy-assignment
std::memcpy( static_cast<void *>(itsPtr), &itsState, sizeof(ParentType) );
itsRestored = true;
}
}

6
scripts/updatecoverage.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Updates the coverage documentation, and copies it into the appropriate place
# in the gh-pages-develop branch.
# in the gh-pages branch.
# $1 from CMAKE will contain the root directory of cereal
# this requires lcov 1.10 or newer
@ -21,11 +21,11 @@ for f in $COVERAGE_TESTS
tempdir=`mktemp -d`
lcov --capture --directory $1 --output-file coverage.info --no-external
lcov --remove coverage.info '*/external/*' 'cereal/details/util.hpp' 'sandbox/*' 'unittests/*' -o coverage.info
lcov --remove coverage.info '*/external/*' '*/cereal/details/util.hpp' 'sandbox/*' '*/unittests/*' -o coverage.info
genhtml --demangle-cpp coverage.info --output-directory ${tempdir}
# copy over to gh pages
git checkout gh-pages-develop
git checkout gh-pages
rm -rf $1/assets/coverage
mkdir $1/assets/coverage