3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increased int size for timers to avoid truncations

This commit is contained in:
Phil Nash 2017-12-08 15:57:36 +00:00
parent c4d1aa9033
commit 4da655c1b0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/internal/catch_timer.cpp
View File

@ -9,6 +9,7 @@
#include "catch_timer.h" #include "catch_timer.h"
#include <chrono> #include <chrono>
#include <iostream>
namespace Catch { namespace Catch {
@ -45,11 +46,11 @@ namespace Catch {
void Timer::start() { void Timer::start() {
m_nanoseconds = getCurrentNanosecondsSinceEpoch(); m_nanoseconds = getCurrentNanosecondsSinceEpoch();
} }
auto Timer::getElapsedNanoseconds() const -> unsigned int { auto Timer::getElapsedNanoseconds() const -> uint64_t {
return static_cast<unsigned int>(getCurrentNanosecondsSinceEpoch() - m_nanoseconds); return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
} }
auto Timer::getElapsedMicroseconds() const -> unsigned int { auto Timer::getElapsedMicroseconds() const -> uint64_t {
return static_cast<unsigned int>(getElapsedNanoseconds()/1000); return getElapsedNanoseconds()/1000;
} }
auto Timer::getElapsedMilliseconds() const -> unsigned int { auto Timer::getElapsedMilliseconds() const -> unsigned int {
return static_cast<unsigned int>(getElapsedMicroseconds()/1000); return static_cast<unsigned int>(getElapsedMicroseconds()/1000);

4
include/internal/catch_timer.h
View File

@ -19,8 +19,8 @@ namespace Catch {
uint64_t m_nanoseconds = 0; uint64_t m_nanoseconds = 0;
public: public:
void start(); void start();
auto getElapsedNanoseconds() const -> unsigned int; auto getElapsedNanoseconds() const -> uint64_t;
auto getElapsedMicroseconds() const -> unsigned int; auto getElapsedMicroseconds() const -> uint64_t;
auto getElapsedMilliseconds() const -> unsigned int; auto getElapsedMilliseconds() const -> unsigned int;
auto getElapsedSeconds() const -> double; auto getElapsedSeconds() const -> double;
}; };