From 9a0877379c60ca5956c4f90d25287bba05325354 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Thu, 20 Aug 2015 16:15:20 +0200 Subject: [PATCH] Remove dead code. --- contractor/processing_chain.cpp | 3 +-- datastore.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contractor/processing_chain.cpp b/contractor/processing_chain.cpp index 15c4e0077..376c8ac89 100644 --- a/contractor/processing_chain.cpp +++ b/contractor/processing_chain.cpp @@ -257,7 +257,7 @@ std::size_t Prepare::WriteContractedGraph(unsigned max_node_id, SimpleLogger().Write() << "Building node array"; StaticGraph::EdgeIterator edge = 0; StaticGraph::EdgeIterator position = 0; - StaticGraph::EdgeIterator last_edge = edge; + StaticGraph::EdgeIterator last_edge; // initializing 'first_edge'-field of nodes: for (const auto node : osrm::irange(0u, max_used_node_id+1)) @@ -295,7 +295,6 @@ std::size_t Prepare::WriteContractedGraph(unsigned max_node_id, // serialize all edges SimpleLogger().Write() << "Building edge array"; - edge = 0; int number_of_used_edges = 0; StaticGraph::EdgeArrayEntry current_edge; diff --git a/datastore.cpp b/datastore.cpp index 0d194992c..60c2754c3 100644 --- a/datastore.cpp +++ b/datastore.cpp @@ -230,8 +230,7 @@ int main(const int argc, const char *argv[]) // Allocate a memory layout in shared memory, deallocate previous SharedMemory *layout_memory = SharedMemoryFactory::Get(layout_region, sizeof(SharedDataLayout)); - SharedDataLayout *shared_layout_ptr = static_cast(layout_memory->Ptr()); - shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout(); + SharedDataLayout *shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout(); shared_layout_ptr->SetBlockSize(SharedDataLayout::FILE_INDEX_PATH, file_index_path.length() + 1);