Fixed errors caused by const keyword

SofaPirate · Jul 1, 2015 · 7d73062 · 7d73062
1 parent 2342fab
commit 7d73062
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/Chrono.cpp b/Chrono.cpp
@@ -86,14 +86,24 @@ bool Chrono::isRunning() const {
 
 void Chrono::delay(unsigned long time) {
   time += elapsed();
-  while (!passed(time));
+  while (!hasPassed(time));
 }
 
 unsigned long Chrono::elapsed() const {
   return _offset + (_isRunning ? (_getTime() - _startTime) : 0);
 }
 
-bool Chrono::hasPassed(unsigned long timeout, bool restartIfPassed) const
+bool Chrono::hasPassed(unsigned long timeout) 
+{
+  if (elapsed() >= timeout) {
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+bool Chrono::hasPassed(unsigned long timeout, bool restartIfPassed) 
 {
   if (elapsed() >= timeout) {
     if (restartIfPassed)

diff --git a/Chrono.h b/Chrono.h
@@ -88,8 +88,9 @@ class Chrono
   /// Returns the elapsed time since start (in milliseconds).
   unsigned long elapsed() const;
 
-  /// Returns true iff elapsed time has passed given timeout.
-  bool hasPassed(unsigned long timeout, bool restartIfPassed=false) const;
+  /// Returns true if elapsed time has passed given timeout.
+  bool hasPassed(unsigned long timeout);
+  bool hasPassed(unsigned long timeout, bool restartIfPassed);
 
   /// Returns true iff the chronometer is currently running.
   bool isRunning() const;

diff --git a/LightChrono.cpp b/LightChrono.cpp
@@ -46,7 +46,17 @@ unsigned long LightChrono::elapsed() const {
 	return (millis() - _startTime);
 }
 
-bool Chrono::hasPassed(unsigned long timeout, bool restartIfPassed) const
+bool LightChrono::hasPassed(unsigned long timeout)
+{
+  if (elapsed() >= timeout) {
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+bool LightChrono::hasPassed(unsigned long timeout, bool restartIfPassed)
 {
   if (elapsed() >= timeout) {
     if (restartIfPassed)

diff --git a/LightChrono.h b/LightChrono.h
@@ -55,7 +55,8 @@ class LightChrono
   unsigned long elapsed() const;
 
   /// Returns true iff elapsed time has passed given timeout.
-  bool hasPassed(unsigned long timeout, bool restartIfPassed=false) const;
+  bool hasPassed(unsigned long timeout) ;
+  bool hasPassed(unsigned long timeout, bool restartIfPassed) ;
 };
 
 #endif