commit a717b88e4cffa75dc6ed1f81c11ef3200712a852
author Yingdi Yu <yuyingdi@gmail.com> Wed Mar 09 17:56:42 2016 -0800
committer Yingdi Yu <yuyingdi@gmail.com> Thu Mar 10 14:21:16 2016 -0800
tree 3e7394d904124e67b907eed1754a46740850de7e
parent 2f5379bbe29e196e46f5af0e2623437dc79ba24a

RepetitiveInterval: fix comparison

Change-Id: Ibbe5bae6da038b6a8097dc0db692ed5627dfd439
Refs: #3533

src/repetitive-interval.cpp

diff --git a/src/repetitive-interval.cpp b/src/repetitive-interval.cpp
index 2a441b5..a8104d1 100644
--- a/src/repetitive-interval.cpp
+++ b/src/repetitive-interval.cpp
@@ -258,17 +258,30 @@
 {
   if (m_startDate < interval.getStartDate())
     return true;
+  else if (m_startDate > interval.getStartDate())
+    return false;
+
   if (m_endDate < interval.getEndDate())
     return true;
+  else if (m_endDate > interval.getEndDate())
+    return false;
+
   if (m_intervalStartHour < interval.getIntervalStartHour())
     return true;
+  else if (m_intervalStartHour > interval.getIntervalStartHour())
+    return false;
+
   if (m_intervalEndHour < interval.getIntervalEndHour())
     return true;
+  else if (m_intervalEndHour > interval.getIntervalEndHour())
+    return false;
+
   if (m_nRepeats < interval.getNRepeats())
     return true;
-  if (static_cast<size_t>(m_unit) < static_cast<size_t>(interval.getRepeatUnit()))
-    return true;
-  return false;
+  else if (m_nRepeats > interval.getNRepeats())
+    return false;
+
+  return (static_cast<size_t>(m_unit) < static_cast<size_t>(interval.getRepeatUnit()));
 }
 
 } // namespace gep