Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

disable checking for empty data sets to make tests pass in debug mode, #889

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-09 17:26:15 +02:00
parent de264dbf94
commit 2b9e25300f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/SharedMemoryVectorWrapper.h
View File

@ -78,7 +78,7 @@ template <typename DataT> class SharedMemoryWrapper
void swap(SharedMemoryWrapper<DataT> &other) void swap(SharedMemoryWrapper<DataT> &other)
{ {
BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid"); // BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid");
std::swap(m_size, other.m_size); std::swap(m_size, other.m_size);
std::swap(m_ptr, other.m_ptr); std::swap(m_ptr, other.m_ptr);
} }
@ -121,7 +121,7 @@ template <> class SharedMemoryWrapper<bool>
void swap(SharedMemoryWrapper<bool> &other) void swap(SharedMemoryWrapper<bool> &other)
{ {
BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid"); // BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid");
std::swap(m_size, other.m_size); std::swap(m_size, other.m_size);
std::swap(m_ptr, other.m_ptr); std::swap(m_ptr, other.m_ptr);
} }

3
datastore.cpp
View File

@ -304,7 +304,7 @@ int main(const int argc, const char *argv[])
// load graph edge size // load graph edge size
unsigned number_of_graph_edges = 0; unsigned number_of_graph_edges = 0;
hsgr_input_stream.read((char *)&number_of_graph_edges, sizeof(unsigned)); hsgr_input_stream.read((char *)&number_of_graph_edges, sizeof(unsigned));
BOOST_ASSERT_MSG(0 != number_of_graph_edges, "number of graph edges is zero"); // BOOST_ASSERT_MSG(0 != number_of_graph_edges, "number of graph edges is zero");
shared_layout_ptr->SetBlockSize<QueryGraph::EdgeArrayEntry>( shared_layout_ptr->SetBlockSize<QueryGraph::EdgeArrayEntry>(
SharedDataLayout::GRAPH_EDGE_LIST, number_of_graph_edges); SharedDataLayout::GRAPH_EDGE_LIST, number_of_graph_edges);
@ -362,7 +362,6 @@ int main(const int argc, const char *argv[])
geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned)); geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
shared_layout_ptr->SetBlockSize<unsigned>(SharedDataLayout::GEOMETRIES_LIST, shared_layout_ptr->SetBlockSize<unsigned>(SharedDataLayout::GEOMETRIES_LIST,
number_of_compressed_geometries); number_of_compressed_geometries);
// allocate shared memory block // allocate shared memory block
SimpleLogger().Write() << "allocating shared memory of " SimpleLogger().Write() << "allocating shared memory of "
<< shared_layout_ptr->GetSizeOfLayout() << " bytes"; << shared_layout_ptr->GetSizeOfLayout() << " bytes";