fixed compilation on Windows

This commit is contained in:
Brannon King 2019-09-30 13:22:10 -06:00
parent 7afebb02f4
commit 785471745c
4 changed files with 2 additions and 19 deletions

View file

@ -7,7 +7,6 @@ cache:
stages: stages:
- build - build
- test - test
- quality
jobs: jobs:
include: include:
@ -85,13 +84,3 @@ jobs:
os: osx os: osx
osx_image: xcode8.3 osx_image: xcode8.3
env: NAME=darwin env: NAME=darwin
- stage: quality
name: "check format"
os: linux
dist: xenial
language: minimal
install:
- sudo apt-get install -y clang-format-3.9
script: git diff -U0 origin/master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1

View file

@ -20,9 +20,6 @@ if which ccache >/dev/null; then
ccache -ps ccache -ps
fi fi
export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}"
echo "CXXFLAGS set to $CXXFLAGS"
pushd depends pushd depends
make -j`getconf _NPROCESSORS_ONLN` HOST=i686-w64-mingw32 NO_QT=1 V=1 make -j`getconf _NPROCESSORS_ONLN` HOST=i686-w64-mingw32 NO_QT=1 V=1
popd popd

View file

@ -19,9 +19,6 @@ if which ccache >/dev/null; then
ccache -ps ccache -ps
fi fi
export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}"
echo "CXXFLAGS set to $CXXFLAGS"
pushd depends pushd depends
make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-w64-mingw32 NO_QT=1 V=1 make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-w64-mingw32 NO_QT=1 V=1
popd popd

View file

@ -27,14 +27,14 @@ static managed_mapped_file::segment_manager* segmentManager()
{ {
CSharedMemoryFile() : file(GetDataDir() / "shared.mem") CSharedMemoryFile() : file(GetDataDir() / "shared.mem")
{ {
std::remove(file.c_str()); fs::remove(file);
auto size = (uint64_t)g_memfileSize * 1024ULL * 1024ULL * 1024ULL; auto size = (uint64_t)g_memfileSize * 1024ULL * 1024ULL * 1024ULL;
menaged_file.reset(new managed_mapped_file(bip::create_only, file.c_str(), size)); menaged_file.reset(new managed_mapped_file(bip::create_only, file.c_str(), size));
} }
~CSharedMemoryFile() ~CSharedMemoryFile()
{ {
menaged_file.reset(); menaged_file.reset();
std::remove(file.c_str()); fs::remove(file);
} }
managed_mapped_file::segment_manager* segmentManager() managed_mapped_file::segment_manager* segmentManager()
{ {