From 2daf53ab6c42cff9a3168c312744b091947f40bf Mon Sep 17 00:00:00 2001 From: Paul Fd Date: Tue, 10 Mar 2020 17:52:41 +0100 Subject: [PATCH] chrono literals --- src/sfizz/EQPool.cpp | 3 +-- src/sfizz/Effects.cpp | 8 ++++---- src/sfizz/FilterPool.cpp | 3 +-- src/sfizz/Logger.cpp | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/sfizz/EQPool.cpp b/src/sfizz/EQPool.cpp index dca5ad1c..da8c9c2b 100644 --- a/src/sfizz/EQPool.cpp +++ b/src/sfizz/EQPool.cpp @@ -3,7 +3,6 @@ #include #include "absl/algorithm/container.h" #include "SIMDHelpers.h" -using namespace std::chrono_literals; sfz::EQHolder::EQHolder(const MidiState& state) :midiState(state) @@ -114,7 +113,7 @@ size_t sfz::EQPool::setnumEQs(size_t numEQs) AtomicDisabler disabler { canGiveOutEQs }; while(givingOutEQs) - std::this_thread::sleep_for(1ms); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); auto eqIterator = eqs.begin(); auto eqSentinel = eqs.rbegin(); diff --git a/src/sfizz/Effects.cpp b/src/sfizz/Effects.cpp index 71494d1d..7031582f 100644 --- a/src/sfizz/Effects.cpp +++ b/src/sfizz/Effects.cpp @@ -44,21 +44,21 @@ std::unique_ptr EffectFactory::makeEffect(absl::Span membe if (!opcode) { DBG("The effect does not specify a type"); - return std::make_unique(); + return absl::make_unique(); } const absl::string_view type = opcode->value; - const auto it = absl::c_find_if(_entries, [&](auto&& entry) { return entry.name == type; }); + const auto it = absl::c_find_if(_entries, [&](const FactoryEntry& entry) { return entry.name == type; }); if (it == _entries.end()) { DBG("Unsupported effect type: " << type); - return std::make_unique(); + return absl::make_unique(); } auto fx = it->make(members); if (!fx) { DBG("Could not instantiate effect of type: " << type); - return std::make_unique(); + return absl::make_unique(); } return fx; diff --git a/src/sfizz/FilterPool.cpp b/src/sfizz/FilterPool.cpp index 0f87104e..3be79d7f 100644 --- a/src/sfizz/FilterPool.cpp +++ b/src/sfizz/FilterPool.cpp @@ -4,7 +4,6 @@ #include "AtomicGuard.h" #include #include -using namespace std::chrono_literals; sfz::FilterHolder::FilterHolder(const MidiState& midiState) : midiState(midiState) @@ -113,7 +112,7 @@ size_t sfz::FilterPool::setNumFilters(size_t numFilters) AtomicDisabler disabler { canGiveOutFilters }; while(givingOutFilters) - std::this_thread::sleep_for(1ms); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); auto filterIterator = filters.begin(); auto filterSentinel = filters.rbegin(); diff --git a/src/sfizz/Logger.cpp b/src/sfizz/Logger.cpp index 15b7fa86..fa1defd7 100644 --- a/src/sfizz/Logger.cpp +++ b/src/sfizz/Logger.cpp @@ -13,8 +13,6 @@ #include #include -using namespace std::chrono_literals; - template void printStatistics(std::vector& data) { @@ -141,7 +139,7 @@ void sfz::Logger::moveEvents() noexcept callbackTimes.clear(); } - std::this_thread::sleep_for(10ms); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } }