diff options
| author | Stefan Laner <laner@itestra.de> | 2013-12-20 16:05:55 +0100 |
|---|---|---|
| committer | Stefan Laner <laner@itestra.de> | 2013-12-20 16:05:55 +0100 |
| commit | cde1d7697de21e2d2b44d5e99309f6a98370ad32 (patch) | |
| tree | 350d43aee49c53ba3a616b6bbc57d1af47e04043 | |
| parent | e633fcbff0187f0b3d422af650357d926fed6055 (diff) | |
| parent | c03ec132fd24fdc71207436a1badd2914182fa8b (diff) | |
| download | genivi-common-api-runtime-cde1d7697de21e2d2b44d5e99309f6a98370ad32.tar.gz | |
Merge remote-tracking branch 'origin/maintain/2.0' into dev/windows
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | src/CommonAPI/MainLoopContext.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9b23952..8b57269 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.61) AC_INIT([GENIVI Common API C++ Library], - [2.0], + [2.0.8], [], [CommonAPI]) diff --git a/src/CommonAPI/MainLoopContext.h b/src/CommonAPI/MainLoopContext.h index 8f28e09..9c8b200 100755 --- a/src/CommonAPI/MainLoopContext.h +++ b/src/CommonAPI/MainLoopContext.h @@ -47,7 +47,7 @@ enum class DispatchPriority { }; -static int64_t getCurrentTimeInMs() { +inline int64_t getCurrentTimeInMs() { return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count(); } |