From 88ee59cd5f260add097d0ae2065741d3bf56f96f Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 19 Jun 2018 22:15:52 +0200 Subject: [PATCH] [DEV] update nullptr in null (specific etk) --- echrono/Steady.cpp | 4 ++-- echrono/Time.cpp | 4 ++-- lutin_echrono.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/echrono/Steady.cpp b/echrono/Steady.cpp index ba8cefd..acc792a 100644 --- a/echrono/Steady.cpp +++ b/echrono/Steady.cpp @@ -16,7 +16,7 @@ ETK_DECLARE_TYPE(echrono::Steady); static int64_t getTime() { #if defined(__TARGET_OS__Android) struct timevalnow; - gettimeofday(&now, nullptr); + gettimeofday(&now, null); return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL; #elif defined(__TARGET_OS__Web) \ || defined(__TARGET_OS__Linux) \ @@ -31,7 +31,7 @@ static int64_t getTime() { #endif if (ret != 0) { // Error to get the time ... - now.tv_sec = time(nullptr); + now.tv_sec = time(null); now.tv_nsec = 0; } return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec); diff --git a/echrono/Time.cpp b/echrono/Time.cpp index dacc6bc..4641f15 100644 --- a/echrono/Time.cpp +++ b/echrono/Time.cpp @@ -19,7 +19,7 @@ ETK_DECLARE_TYPE(echrono::Time); static int64_t getTime() { #if defined(__TARGET_OS__Android) struct timevalnow; - gettimeofday(&now, nullptr); + gettimeofday(&now, null); return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_usec)*1000LL; #elif defined(__TARGET_OS__Web) \ || defined(__TARGET_OS__Linux) \ @@ -30,7 +30,7 @@ static int64_t getTime() { int ret = clock_gettime(CLOCK_REALTIME, &now); if (ret != 0) { // Error to get the time ... - now.tv_sec = time(nullptr); + now.tv_sec = time(null); now.tv_nsec = 0; } return int64_t(now.tv_sec)*1000000000LL + int64_t(now.tv_nsec); diff --git a/lutin_echrono.py b/lutin_echrono.py index 32f56b4..61a8754 100644 --- a/lutin_echrono.py +++ b/lutin_echrono.py @@ -47,7 +47,7 @@ def configure(target, my_module): # name of the dependency my_module.add_depend([ 'elog', - 'etk', + 'etk-base', ]) my_module.add_path(".")