From 12c291f9d7a1aa3776133bd911c1aa3263010835 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Wed, 19 Sep 2012 06:15:42 -0400 Subject: AddrRange: Remove unused range_multimap This patch simply removes the unused range_multimap in preparation for a more specific AddrRangeMap that also allows interleaving in addition to pure ranges. --- src/base/range_map.hh | 124 -------------------------------------------------- 1 file changed, 124 deletions(-) (limited to 'src/base') diff --git a/src/base/range_map.hh b/src/base/range_map.hh index 0be228228..a9774274e 100644 --- a/src/base/range_map.hh +++ b/src/base/range_map.hh @@ -197,128 +197,4 @@ class range_map } }; - -template -class range_multimap -{ - private: - typedef std::multimap,V> RangeMap; - RangeMap tree; - - public: - typedef typename RangeMap::iterator iterator; - - template - std::pair find(const Range &r) - { - iterator i; - iterator j; - - i = tree.lower_bound(r); - - if (i == tree.begin()) { - if (i->first.start <= r.end && i->first.end >= r.start) - return std::make_pair(i,i); - else - // Nothing could match, so return end() - return std::make_pair(tree.end(), tree.end()); - } - i--; - - if (i->first.start <= r.end && i->first.end >= r.start) { - // we have at least one match - j = i; - - i--; - while (i->first.start <= r.end && i->first.end >= - r.start) { - if (i == tree.begin()) - break; - i--; - } - if (i == tree.begin() && i->first.start <= r.end && i->first.end >= - r.start) - return std::make_pair(i,j); - i++; - return std::make_pair(i,j); - - } - - return std::make_pair(tree.end(), tree.end()); - } - - template - bool - intersect(const Range &r) - { - std::pair p; - p = find(r); - if (p.first != tree.end()) - return true; - return false; - } - - - template - iterator - insert(const Range &r, const W d) - { - std::pair p; - p = find(r); - if ((p.first->first.start == r.start && p.first->first.end == r.end) || - p.first == tree.end()) - return tree.insert(std::make_pair,V>(r, d)); - else - return tree.end(); - } - - size_t - erase(T k) - { - return tree.erase(k); - } - - void - erase(iterator p) - { - tree.erase(p); - } - - void - erase(iterator p, iterator q) - { - tree.erase(p,q); - } - - void - clear() - { - tree.erase(tree.begin(), tree.end()); - } - - iterator - begin() - { - return tree.begin(); - } - - iterator - end() - { - return tree.end(); - } - - size_t - size() - { - return tree.size(); - } - - bool - empty() - { - return tree.empty(); - } -}; - #endif //__BASE_RANGE_MAP_HH__ -- cgit v1.2.3