Fixed merge error

This commit is contained in:
Manuel Reimer
2014-11-02 18:38:22 +01:00
7 changed files with 52 additions and 8 deletions

View File

@@ -167,9 +167,12 @@ vector<string>& splitstring::split(char delim, int rep) {
return flds;
}
cStopWatch::cStopWatch(void) {
cStopWatch::cStopWatch(const char* message) {
start = cTimeMs::Now();
last = start;
if (message) {
dsyslog("skindesigner: Starting StopWatch %s", message);
}
}
void cStopWatch::Report(const char* message) {

View File

@@ -33,7 +33,7 @@ private:
uint64_t start;
uint64_t last;
public:
cStopWatch(void);
cStopWatch(const char* message = NULL);
~cStopWatch(void) {};
void Report(const char* message);
void Stop(const char* message);