Skip to content

Commit

Permalink
Fix valgrind test
Browse files Browse the repository at this point in the history
  • Loading branch information
igorcanadi committed Jul 25, 2014
1 parent 6480717 commit c8e70e6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions utilities/spatialdb/spatial_db.cc
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ class SpatialDBImpl : public SpatialDB {
// families that correspond to those spatial indexes
// * next_id -- next ID in auto-incrementing ID. This is usually
// `max_id_currenty_in_db + 1`
SpatialDBImpl(DB* db, ColumnFamilyHandle* data_column_family,
const std::vector<
std::pair<const SpatialIndexOptions&, ColumnFamilyHandle*>>
spatial_indexes,
uint64_t next_id)
SpatialDBImpl(
DB* db, ColumnFamilyHandle* data_column_family,
const std::vector<std::pair<SpatialIndexOptions, ColumnFamilyHandle*>>&
spatial_indexes,
uint64_t next_id)
: SpatialDB(db),
data_column_family_(data_column_family),
next_id_(next_id) {
Expand Down Expand Up @@ -668,8 +668,7 @@ Status SpatialDB::Open(const SpatialDBOptions& options, const std::string& name,

MetadataStorage metadata(base_db, handles[1]);

std::vector<std::pair<const SpatialIndexOptions&, ColumnFamilyHandle*>>
index_cf;
std::vector<std::pair<SpatialIndexOptions, ColumnFamilyHandle*>> index_cf;
assert(handles.size() == spatial_indexes.size() + 2);
for (size_t i = 0; i < spatial_indexes.size(); ++i) {
SpatialIndexOptions index_options;
Expand Down

0 comments on commit c8e70e6

Please sign in to comment.