From e86278f0509dd2460776ae5047782b9e702f40de Mon Sep 17 00:00:00 2001 From: Matthew Ellison Date: Fri, 8 Feb 2019 14:39:20 -0500 Subject: [PATCH] Updated to correct scope problem --- Stopwatch.hpp | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/Stopwatch.hpp b/Stopwatch.hpp index bbb7841..b1b6745 100644 --- a/Stopwatch.hpp +++ b/Stopwatch.hpp @@ -48,22 +48,35 @@ private: return -1; } //Decide what resolution to make the duration - switch(timeResolution){ - case HOUR: std::chrono::duration> dur = (endTime - startTime); - timePassed = dur.count(); break; - case MINUTE: std::chrono::duration> dur = (endTime - startTime); - timePassed = dur.count(); break; - case SECOND: std::chrono::duration dur = (endTime - startTime); - timePassed = dur.count(); break; - case MILLISECOND: std::chrono::duration dur = (endTime - startTime); - timePassed = dur.count(); break; - case MICROSECOND: std::chrono::duration dur = (endTime - startTime); - timePassed = dur.count(); break; - case NANOSECOND: std::chrono::duration dur = (endTime - startTime); - timePassed = dur.count(); break; - case DEFAULT: std::chrono::high_resolution_clock::duration dur = (endTime - startTime); - timePassed = dur.count(); break; + if(timeResolution == HOUR){ + std::chrono::duration> dur = (endTime - startTime); + timePassed = dur.count(); } + else if(timeResolution == MINUTE){ + std::chrono::duration> dur = (endTime - startTime); + timePassed = dur.count(); + } + else if(timeResolution == SECOND){ + std::chrono::duration dur = (endTime - startTime); + timePassed = dur.count(); + } + else if(timeResolution == MILLISECOND){ + std::chrono::duration dur = (endTime - startTime); + timePassed = dur.count(); + } + else if(timeResolution == MICROSECOND){ + std::chrono::duration dur = (endTime - startTime); + timePassed = dur.count(); + } + else if(timeResolution == NANOSECOND){ + std::chrono::duration dur = (endTime - startTime); + timePassed = dur.count(); + } + else if(timeResolution == DEFAULT){ + std::chrono::high_resolution_clock::duration dur = (endTime - startTime); + timePassed = dur.count(); + } + return timePassed; } public: