Skip to content

S
spdlog
Commit e42867f0 authored by gabime's avatar gabime
Browse files
Options

Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

parents fe20afac 10578ff0
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
.travis.yml
View file @ e42867f0
...@@ -66,13 +66,11 @@ matrix: ...@@ -66,13 +66,11 @@ matrix:
addons: *clang35 addons: *clang35
# Test clang-7.0: C++11, Build=Debug, ASAN=On # Test clang-7.0: C++11, Build=Debug, ASAN=On
- env: CLANG_VERSION=7.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off - env: CLANG_VERSION=7 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off
os: linux dist: bionic
addons: *clang70
- env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off - env: CLANG_VERSION=7 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off
os: linux dist: bionic
addons: *clang70
# osx # osx
- env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
......
tests/test_mpmc_q.cpp
View file @ e42867f0
...@@ -29,7 +29,7 @@ TEST_CASE("dequeue-empty-wait", "[mpmc_blocking_q]") ...@@ -29,7 +29,7 @@ TEST_CASE("dequeue-empty-wait", "[mpmc_blocking_q]")
size_t q_size = 100; size_t q_size = 100;
milliseconds wait_ms(250); milliseconds wait_ms(250);
milliseconds tolerance_wait(50); milliseconds tolerance_wait(250);
spdlog::details::mpmc_blocking_queue<int> q(q_size); spdlog::details::mpmc_blocking_queue<int> q(q_size);
int popped_item; int popped_item;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment