summaryrefslogtreecommitdiff
path: root/src/common/timer.h
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-21 11:29:48 -0700
committerGravatar GitHub2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/common/timer.h
parentREADME: Specify master branch for Travis CI badge (diff)
parentFix Travis clang-format check (diff)
downloadyuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/common/timer.h')
-rw-r--r--src/common/timer.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/common/timer.h b/src/common/timer.h
index b5f0f2585..78d37426b 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -4,13 +4,11 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common/common_types.h"
8#include <string> 7#include <string>
8#include "common/common_types.h"
9 9
10namespace Common 10namespace Common {
11{ 11class Timer {
12class Timer
13{
14public: 12public:
15 Timer(); 13 Timer();
16 14
@@ -18,7 +16,8 @@ public:
18 void Stop(); 16 void Stop();
19 void Update(); 17 void Update();
20 18
21 // The time difference is always returned in milliseconds, regardless of alternative internal representation 19 // The time difference is always returned in milliseconds, regardless of alternative internal
20 // representation
22 u64 GetTimeDifference(); 21 u64 GetTimeDifference();
23 void AddTimeDifference(); 22 void AddTimeDifference();
24 23