ConfigUtility now supports recursion; is a Singleton
If you have "config.next" set, the config system will load that as another config file. Higher config files have a higher precedence over subfiles when conflicting keys are encountered. * Added singleton.hpp, containing Singleton<T> * ConfigUtility now inherits from Singleton * Tweaked timer.*pp layouts
This commit is contained in:
@@ -30,15 +30,15 @@ class Timer {
|
||||
public:
|
||||
typedef std::chrono::high_resolution_clock Clock;
|
||||
|
||||
Timer() = default;
|
||||
Timer(std::string s) : name(s), start(Clock::now()) {};
|
||||
Timer();
|
||||
Timer(std::string s);
|
||||
~Timer() = default;
|
||||
|
||||
inline void Start() { start = Clock::now(); }
|
||||
inline void Stop() { time = Clock::now() - start; }
|
||||
inline void Start();
|
||||
inline void Stop();
|
||||
|
||||
//accessors and mutators
|
||||
Clock::duration GetTime() { return time; }
|
||||
Clock::duration GetTime() { return timeSpan; }
|
||||
|
||||
std::string SetName(std::string s) { return name = s; }
|
||||
std::string GetName() { return name; }
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
private:
|
||||
std::string name;
|
||||
Clock::time_point start;
|
||||
Clock::duration time;
|
||||
Clock::duration timeSpan;
|
||||
};
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, Timer& t);
|
||||
|
||||
Reference in New Issue
Block a user