From 2672787ccbb25b3950d025ba7d11bac8a4349d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Wed, 11 Nov 2015 13:02:04 +0100 Subject: [PATCH] tests: cpp11_condition_variable: vtimer to xtimer --- tests/cpp11_condition_variable/Makefile | 2 +- tests/cpp11_condition_variable/main.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/cpp11_condition_variable/Makefile b/tests/cpp11_condition_variable/Makefile index e8ecda27f..a3eabd35c 100644 --- a/tests/cpp11_condition_variable/Makefile +++ b/tests/cpp11_condition_variable/Makefile @@ -28,7 +28,7 @@ QUIET ?= 1 CXXEXFLAGS += -std=c++11 USEMODULE += cpp11-compat -USEMODULE += vtimer +USEMODULE += xtimer USEMODULE += timex include $(RIOTBASE)/Makefile.include diff --git a/tests/cpp11_condition_variable/main.cpp b/tests/cpp11_condition_variable/main.cpp index 41c225a7f..69378c096 100644 --- a/tests/cpp11_condition_variable/main.cpp +++ b/tests/cpp11_condition_variable/main.cpp @@ -98,9 +98,9 @@ int main() { condition_variable cv; timex_t before, after; unique_lock lk(m); - vtimer_now(&before); + xtimer_now_timex(&before); cv.wait_for(lk, chrono::seconds(timeout)); - vtimer_now(&after); + xtimer_now_timex(&after); auto diff = timex_sub(after, before); assert(diff.seconds >= timeout); } @@ -114,10 +114,10 @@ int main() { condition_variable cv; timex_t before, after; unique_lock lk(m); - vtimer_now(&before); + xtimer_now_timex(&before); auto time = riot::now() += chrono::seconds(timeout); cv.wait_until(lk, time); - vtimer_now(&after); + xtimer_now_timex(&after); auto diff = timex_sub(after, before); assert(diff.seconds >= timeout); }