diff options
| author | 2013-08-19 16:27:15 +0000 | |
|---|---|---|
| committer | 2013-08-19 16:27:15 +0000 | |
| commit | 2aa25df0c41bb620c8cc239600af738855169bed (patch) | |
| tree | 0a11e7f31ce56145e8b9e244e0ad19b7a2fe6805 /runtime/utils.h | |
| parent | 97b2ea217f758ff3e3b24896cf7cf201f06f8541 (diff) | |
| parent | 720ef7680573c1afd12f99f02eee3045daee5168 (diff) | |
Merge "Fix non concurrent GC ergonomics." into dalvik-dev
Diffstat (limited to 'runtime/utils.h')
| -rw-r--r-- | runtime/utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/utils.h b/runtime/utils.h index bd8111454f..fcbb992bf4 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -289,12 +289,12 @@ uint64_t NanoTime(); uint64_t ThreadCpuNanoTime(); // Converts the given number of nanoseconds to milliseconds. -static inline uint64_t NsToMs(uint64_t ns) { +static constexpr inline uint64_t NsToMs(uint64_t ns) { return ns / 1000 / 1000; } // Converts the given number of milliseconds to nanoseconds -static inline uint64_t MsToNs(uint64_t ns) { +static constexpr inline uint64_t MsToNs(uint64_t ns) { return ns * 1000 * 1000; } |