From 13cf93a3228e43de0df51d1ec6565f2cad4a5b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 18 Jun 2018 09:49:00 +0200 Subject: [PATCH] Rename private variable maxtime --- lib/tokenize.cpp | 6 +++--- lib/tokenize.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index f5c11931c..b2ac1f525 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -148,7 +148,7 @@ Tokenizer::Tokenizer() : mCodeWithTemplates(false), //is there any templates? mTimerResults(nullptr) #ifdef MAXTIME - ,maxtime(std::time(0) + MAXTIME) + ,mMaxTime(std::time(0) + MAXTIME) #endif { } @@ -163,7 +163,7 @@ Tokenizer::Tokenizer(const Settings *settings, ErrorLogger *errorLogger) : mCodeWithTemplates(false), //is there any templates? mTimerResults(nullptr) #ifdef MAXTIME - ,maxtime(std::time(0) + MAXTIME) + ,mMaxTime(std::time(0) + MAXTIME) #endif { // make sure settings are specified @@ -2295,7 +2295,7 @@ void Tokenizer::simplifyTemplates() mErrorLogger, mSettings, #ifdef MAXTIME - maxtime, + mMaxTime, #else 0, // ignored #endif diff --git a/lib/tokenize.h b/lib/tokenize.h index 590d815a2..1357e173b 100644 --- a/lib/tokenize.h +++ b/lib/tokenize.h @@ -838,7 +838,7 @@ public: #ifdef MAXTIME bool isMaxTime() const { - return (std::time(0) > maxtime); + return (std::time(0) > mMaxTime); #else static bool isMaxTime() { return false; @@ -900,7 +900,7 @@ private: #ifdef MAXTIME /** Tokenizer maxtime */ - std::time_t maxtime; + const std::time_t mMaxTime; #endif };