From ddf2457ce7db49570526c09ff31052504a3b0668 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Thu, 15 Nov 2018 16:26:51 +0100 Subject: [PATCH] [ion/timing] Fix some typos --- ion/src/blackbox/ion.cpp | 4 ++-- ion/src/emscripten/main.cpp | 4 ++-- ion/src/shared/timing.cpp | 2 +- ion/src/simulator/init.cpp | 4 ++-- quiz/src/runner.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ion/src/blackbox/ion.cpp b/ion/src/blackbox/ion.cpp index 8a634fce9..39432fa16 100644 --- a/ion/src/blackbox/ion.cpp +++ b/ion/src/blackbox/ion.cpp @@ -1,8 +1,8 @@ #include #include -void Ion::msleep(uint32_t ms) { +void Ion::Timing::msleep(uint32_t ms) { } -void Ion::usleep(uint32_t us) { +void Ion::Timing::usleep(uint32_t us) { } diff --git a/ion/src/emscripten/main.cpp b/ion/src/emscripten/main.cpp index 7ba9c76b0..daee539d3 100644 --- a/ion/src/emscripten/main.cpp +++ b/ion/src/emscripten/main.cpp @@ -20,10 +20,10 @@ int main(int argc, char * argv[]) { return 0; } -void Ion::msleep(uint32_t ms) { +void Ion::Timing::msleep(uint32_t ms) { emscripten_sleep(ms); } -void Ion::usleep(uint32_t us) { +void Ion::Timing::usleep(uint32_t us) { emscripten_sleep(us/1000); } diff --git a/ion/src/shared/timing.cpp b/ion/src/shared/timing.cpp index 6e47a293e..a9bf44567 100644 --- a/ion/src/shared/timing.cpp +++ b/ion/src/shared/timing.cpp @@ -3,7 +3,7 @@ static auto start = std::chrono::steady_clock::now(); -uint64_t Ion::millis() { +uint64_t Ion::Timing::millis() { auto elapsed = std::chrono::steady_clock::now() - start; return std::chrono::duration_cast(elapsed).count(); } diff --git a/ion/src/simulator/init.cpp b/ion/src/simulator/init.cpp index f456b25aa..437ef5be6 100644 --- a/ion/src/simulator/init.cpp +++ b/ion/src/simulator/init.cpp @@ -104,7 +104,7 @@ Ion::Events::Event Ion::Events::getEvent(int * timeout) { #include -void Ion::msleep(uint32_t ms) { +void Ion::Timing::msleep(uint32_t ms) { auto start = std::chrono::high_resolution_clock::now(); while (true) { sDisplay->redraw(); @@ -117,7 +117,7 @@ void Ion::msleep(uint32_t ms) { } } -void Ion::usleep(uint32_t us) { +void Ion::Timing::usleep(uint32_t us) { auto start = std::chrono::high_resolution_clock::now(); while (true) { sDisplay->redraw(); diff --git a/quiz/src/runner.cpp b/quiz/src/runner.cpp index b3dbd1a32..935fa44aa 100644 --- a/quiz/src/runner.cpp +++ b/quiz/src/runner.cpp @@ -39,7 +39,7 @@ static inline void ion_main_inner() { quiz_print("ALL TESTS FINISHED"); #if !QUIZ_USE_CONSOLE while (1) { - Ion::msleep(1000); + Ion::Timing::msleep(1000); } #endif } @@ -59,7 +59,7 @@ void ion_main(int argc, char * argv[]) { quiz_assert(false); #if !QUIZ_USE_CONSOLE while (1) { - Ion::msleep(1000); + Ion::Timing::msleep(1000); } #endif }