remove code below asserts in limitedmap.h (fixes a ToDo)
This commit is contained in:
parent
5547f08ec7
commit
2e5361b9c2
@ -1,11 +1,11 @@
|
||||
// Copyright (c) 2012 The Bitcoin developers
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// Copyright (c) 2012-2014 The Bitcoin developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_LIMITEDMAP_H
|
||||
#define BITCOIN_LIMITEDMAP_H
|
||||
|
||||
#include <assert.h> // TODO: remove
|
||||
#include <assert.h>
|
||||
#include <map>
|
||||
|
||||
/** STL-like map container that only keeps the N elements with the highest value. */
|
||||
@ -59,12 +59,11 @@ public:
|
||||
return;
|
||||
}
|
||||
// Shouldn't ever get here
|
||||
assert(0); //TODO remove me
|
||||
map.erase(itTarget);
|
||||
assert(0);
|
||||
}
|
||||
void update(const_iterator itIn, const mapped_type& v)
|
||||
{
|
||||
//TODO: When we switch to C++11, use map.erase(itIn, itIn) to get the non-const iterator
|
||||
// TODO: When we switch to C++11, use map.erase(itIn, itIn) to get the non-const iterator.
|
||||
iterator itTarget = map.find(itIn->first);
|
||||
if (itTarget == map.end())
|
||||
return;
|
||||
@ -77,9 +76,7 @@ public:
|
||||
return;
|
||||
}
|
||||
// Shouldn't ever get here
|
||||
assert(0); //TODO remove me
|
||||
itTarget->second = v;
|
||||
rmap.insert(make_pair(v, itTarget));
|
||||
assert(0);
|
||||
}
|
||||
size_type max_size() const { return nMaxSize; }
|
||||
size_type max_size(size_type s)
|
||||
|
Loading…
Reference in New Issue
Block a user