Skip to content

Remove extra Clock:: #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 5, 2017
Merged

Remove extra Clock:: #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/common/time/time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ class Clock {
* @return a Timestamp object representing the current time.
*/
static Timestamp Now() {
return Clock::instance()->is_system_clock_ ? SystemNow()
: Clock::instance()->mock_now_;
return instance()->is_system_clock_ ? SystemNow()
: instance()->mock_now_;
}

/**
Expand All @@ -164,21 +164,21 @@ class Clock {
* provided with FALSE, it will use the mock clock instead.
*/
static void UseSystemClock(bool is_system_clock) {
Clock::instance()->is_system_clock_ = is_system_clock;
instance()->is_system_clock_ = is_system_clock;
}

/**
* @brief Check whether the \class Clock instance is using system clock.
* @return TRUE if it is using system clock, and FALSE otherwise.
*/
static bool IsSystemClock() { return Clock::instance()->is_system_clock_; }
static bool IsSystemClock() { return instance()->is_system_clock_; }

/**
* @brief This is for mock clock mode only. It will set the timestamp
* for the mock clock.
*/
static void SetNow(const Duration &duration) {
Clock *clock = Clock::instance();
Clock *clock = instance();
if (clock->is_system_clock_) {
throw std::runtime_error("Cannot set now when using system clock!");
}
Expand Down