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/unittest/SConscript | 1 - src/unittest/rangemultimaptest.cc | 80 --------------------------------------- 2 files changed, 81 deletions(-) delete mode 100644 src/unittest/rangemultimaptest.cc (limited to 'src/unittest') diff --git a/src/unittest/SConscript b/src/unittest/SConscript index d409ec9a5..3ae92194c 100644 --- a/src/unittest/SConscript +++ b/src/unittest/SConscript @@ -45,7 +45,6 @@ UnitTest('nmtest', 'nmtest.cc') UnitTest('offtest', 'offtest.cc') UnitTest('rangetest', 'rangetest.cc') UnitTest('rangemaptest', 'rangemaptest.cc') -UnitTest('rangemultimaptest', 'rangemultimaptest.cc') UnitTest('refcnttest', 'refcnttest.cc') UnitTest('strnumtest', 'strnumtest.cc') UnitTest('trietest', 'trietest.cc') diff --git a/src/unittest/rangemultimaptest.cc b/src/unittest/rangemultimaptest.cc deleted file mode 100644 index b5d114301..000000000 --- a/src/unittest/rangemultimaptest.cc +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Ali Saidi - */ - -#include -#include - -#include "base/range_map.hh" -#include "base/types.hh" - -using namespace std; - -int -main() -{ - typedef range_multimap multimap_t; - - multimap_t r; - multimap_t::iterator i; - std::pair jk; - - i = r.insert(RangeIn(10,40),5); - assert(i != r.end()); - i = r.insert(RangeIn(10,40),6); - assert(i != r.end()); - i = r.insert(RangeIn(60,90),3); - assert(i != r.end()); - - jk = r.find(RangeIn(20,30)); - assert(jk.first != r.end()); - cout << jk.first->first << " " << jk.first->second << endl; - cout << jk.second->first << " " << jk.second->second << endl; - - i = r.insert(RangeIn(0,3),5); - assert(i != r.end()); - - for( i = r.begin(); i != r.end(); i++) - cout << i->first << " " << i->second << endl; - - jk = r.find(RangeIn(20,30)); - assert(jk.first != r.end()); - cout << jk.first->first << " " << jk.first->second << endl; - cout << jk.second->first << " " << jk.second->second << endl; - - -} - - - - - - - - -- cgit v1.2.3