Merge branch 'master' into dev

This commit is contained in:
daan 2019-06-25 19:45:59 -07:00
commit cae02b4676
2 changed files with 54 additions and 1 deletions

51
azure-pipelines.yml Normal file
View File

@ -0,0 +1,51 @@
# Starter pipeline
# Start with a minimal pipeline that you can customize to build and deploy your code.
# Add steps that build, run tests, deploy, and more:
# https://aka.ms/yaml
trigger:
- master
- dev
jobs:
- job:
displayName: Windows
pool:
vmImage:
windows-2019
steps:
- task: CMake@1
inputs:
workingDirectory: 'build'
cmakeArgs: ..
- task: MSBuild@1
inputs:
solution: build/libmimalloc.sln
- upload: $(Build.SourcesDirectory)/build
artifact: windows
- job:
displayName: Linux
pool:
vmImage:
ubuntu-16.04
steps:
- task: CMake@1
inputs:
workingDirectory: 'build'
cmakeArgs: ..
- script: make -j$(nproc) -C build
- upload: $(Build.SourcesDirectory)/build
artifact: ubuntu
- job:
displayName: macOS
pool:
vmImage:
macOS-10.14
steps:
- task: CMake@1
inputs:
workingDirectory: 'build'
cmakeArgs: ..
- script: make -j$(sysctl -n hw.ncpu) -C build
- upload: $(Build.SourcesDirectory)/build
artifact: macos

View File

@ -234,10 +234,12 @@ static bool _mi_heap_done(void) {
}
_mi_os_free(heap, sizeof(mi_thread_data_t), &_mi_stats_main);
}
else if (MI_DEBUG > 0) {
#if (MI_DEBUG > 0)
else {
_mi_heap_destroy_pages(heap);
mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main);
}
#endif
return false;
}