From a0cf46df981394cf84cb326cc00cdbc87f91a476 Mon Sep 17 00:00:00 2001 From: Brannon King Date: Mon, 30 Sep 2019 13:22:10 -0600 Subject: [PATCH] fixed compilation on Windows --- .travis.yml | 11 ----------- packaging/build_windows_32bit.sh | 3 --- packaging/build_windows_64bit.sh | 3 --- src/prefixtrie.cpp | 4 ++-- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index db86f4574..e46781e58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ cache: stages: - build - test - - quality jobs: include: @@ -85,13 +84,3 @@ jobs: os: osx osx_image: xcode8.3 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 diff --git a/packaging/build_windows_32bit.sh b/packaging/build_windows_32bit.sh index c9686f85d..8d9bcfbf9 100755 --- a/packaging/build_windows_32bit.sh +++ b/packaging/build_windows_32bit.sh @@ -20,9 +20,6 @@ if which ccache >/dev/null; then ccache -ps fi -export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}" -echo "CXXFLAGS set to $CXXFLAGS" - pushd depends make -j`getconf _NPROCESSORS_ONLN` HOST=i686-w64-mingw32 NO_QT=1 V=1 popd diff --git a/packaging/build_windows_64bit.sh b/packaging/build_windows_64bit.sh index bf4ad9d42..121f4f206 100755 --- a/packaging/build_windows_64bit.sh +++ b/packaging/build_windows_64bit.sh @@ -19,9 +19,6 @@ if which ccache >/dev/null; then ccache -ps fi -export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}" -echo "CXXFLAGS set to $CXXFLAGS" - pushd depends make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-w64-mingw32 NO_QT=1 V=1 popd diff --git a/src/prefixtrie.cpp b/src/prefixtrie.cpp index 36a88e4c6..3a4062bff 100644 --- a/src/prefixtrie.cpp +++ b/src/prefixtrie.cpp @@ -27,14 +27,14 @@ static managed_mapped_file::segment_manager* segmentManager() { CSharedMemoryFile() : file(GetDataDir() / "shared.mem") { - std::remove(file.c_str()); + fs::remove(file); auto size = (uint64_t)g_memfileSize * 1024ULL * 1024ULL * 1024ULL; menaged_file.reset(new managed_mapped_file(bip::create_only, file.c_str(), size)); } ~CSharedMemoryFile() { menaged_file.reset(); - std::remove(file.c_str()); + fs::remove(file); } managed_mapped_file::segment_manager* segmentManager() {