Merge branch 'master' into space-map-checking

This commit is contained in:
Joe Thornber
2015-04-07 12:18:23 +01:00
168 changed files with 7851 additions and 2250 deletions

View File

@@ -19,6 +19,8 @@
#include "persistent-data/space-maps/recursive.h"
#include "persistent-data/space-maps/subtracting_span_iterator.h"
#include <list>
using namespace persistent_data;
//----------------------------------------------------------------
@@ -290,7 +292,7 @@ namespace {
BOP_SET
};
typedef map<block_address, list<block_op> > op_map;
typedef map<block_address, std::list<block_op> > op_map;
op_map ops_;
subtracting_span_iterator::block_set allocated_blocks_;