From 626c17679c2efc3f194432ef55235ace6921db30 Mon Sep 17 00:00:00 2001 From: David Schwartz Date: Thu, 25 Jul 2013 11:59:04 -0700 Subject: [PATCH] Simplify prevMissing --- .../containers/ripple_RangeSet.cpp | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/modules/ripple_basics/containers/ripple_RangeSet.cpp b/modules/ripple_basics/containers/ripple_RangeSet.cpp index b13f1238ba..0509029e83 100644 --- a/modules/ripple_basics/containers/ripple_RangeSet.cpp +++ b/modules/ripple_basics/containers/ripple_RangeSet.cpp @@ -91,28 +91,10 @@ uint32 RangeSet::prevMissing (uint32 v) const for (const_reverse_iterator cur = mRanges.rbegin (); cur != mRanges.rend (); ++cur) { - // See if v is in the range - if (contains (*cur, v)) + // See if v-1 is in the range + if (contains (*cur, result)) { - if (cur->first > 0) - result = cur->first - 1; - else - result = absent; - - break; - } - else if (v > cur->second) - { - // v lies "above" the interval - - if (v == cur->second + 1) - { - if (cur->first > 0) - result = cur->first - 1; - else - result = v - 1; - } - + result = cur->first - 1; break; } }