From 5517ee334f3fab531a003e3b08ad84017d8237ac Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Tue, 3 May 2016 11:48:33 +0200 Subject: [PATCH] Remove typename prefix from non-dependent type alias I think VS is predantic but actually right here. References: - http://eel.is/c++draft/namespace.udecl#19 --- .../engine/datafacade/internal_datafacade.hpp | 8 ++-- .../engine/datafacade/shared_datafacade.hpp | 44 +++++++++---------- src/storage/storage.cpp | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/engine/datafacade/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp index 4a23260d9..71df56457 100644 --- a/include/engine/datafacade/internal_datafacade.hpp +++ b/include/engine/datafacade/internal_datafacade.hpp @@ -56,8 +56,8 @@ class InternalDataFacade final : public BaseDataFacade private: using super = BaseDataFacade; using QueryGraph = util::StaticGraph; - using InputEdge = typename QueryGraph::InputEdge; - using RTreeLeaf = typename super::RTreeLeaf; + using InputEdge = QueryGraph::InputEdge; + using RTreeLeaf = super::RTreeLeaf; using InternalRTree = util::StaticRTree::vector, false>; using InternalGeospatialQuery = GeospatialQuery; @@ -113,8 +113,8 @@ class InternalDataFacade final : public BaseDataFacade void LoadGraph(const boost::filesystem::path &hsgr_path) { - typename util::ShM::vector node_list; - typename util::ShM::vector edge_list; + typename util::ShM::vector node_list; + typename util::ShM::vector edge_list; util::SimpleLogger().Write() << "loading graph from " << hsgr_path.string(); diff --git a/include/engine/datafacade/shared_datafacade.hpp b/include/engine/datafacade/shared_datafacade.hpp index c099e8309..59d905d26 100644 --- a/include/engine/datafacade/shared_datafacade.hpp +++ b/include/engine/datafacade/shared_datafacade.hpp @@ -47,16 +47,16 @@ class SharedDataFacade final : public BaseDataFacade private: using super = BaseDataFacade; using QueryGraph = util::StaticGraph; - using GraphNode = typename QueryGraph::NodeArrayEntry; - using GraphEdge = typename QueryGraph::EdgeArrayEntry; - using NameIndexBlock = typename util::RangeTable<16, true>::BlockT; - using InputEdge = typename QueryGraph::InputEdge; - using RTreeLeaf = typename super::RTreeLeaf; + using GraphNode = QueryGraph::NodeArrayEntry; + using GraphEdge = QueryGraph::EdgeArrayEntry; + using NameIndexBlock = util::RangeTable<16, true>::BlockT; + using InputEdge = QueryGraph::InputEdge; + using RTreeLeaf = super::RTreeLeaf; using SharedRTree = util::StaticRTree::vector, true>; using SharedGeospatialQuery = GeospatialQuery; using TimeStampedRTreePair = std::pair>; - using RTreeNode = typename SharedRTree::TreeNode; + using RTreeNode = SharedRTree::TreeNode; storage::SharedDataLayout *data_layout; char *shared_memory; @@ -141,9 +141,9 @@ class SharedDataFacade final : public BaseDataFacade auto graph_edges_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::GRAPH_EDGE_LIST); - typename util::ShM::vector node_list( + util::ShM::vector node_list( graph_nodes_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_NODE_LIST]); - typename util::ShM::vector edge_list( + util::ShM::vector edge_list( graph_edges_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_EDGE_LIST]); m_query_graph.reset(new QueryGraph(node_list, edge_list)); } @@ -158,14 +158,14 @@ class SharedDataFacade final : public BaseDataFacade auto travel_mode_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::TRAVEL_MODE); - typename util::ShM::vector travel_mode_list( + util::ShM::vector travel_mode_list( travel_mode_list_ptr, data_layout->num_entries[storage::SharedDataLayout::TRAVEL_MODE]); m_travel_mode_list = std::move(travel_mode_list); auto turn_instruction_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::TURN_INSTRUCTION); - typename util::ShM::vector + util::ShM::vector turn_instruction_list( turn_instruction_list_ptr, data_layout->num_entries[storage::SharedDataLayout::TURN_INSTRUCTION]); @@ -173,7 +173,7 @@ class SharedDataFacade final : public BaseDataFacade auto name_id_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::NAME_ID_LIST); - typename util::ShM::vector name_id_list( + util::ShM::vector name_id_list( name_id_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_ID_LIST]); m_name_ID_list = std::move(name_id_list); } @@ -182,7 +182,7 @@ class SharedDataFacade final : public BaseDataFacade { auto via_node_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::VIA_NODE_LIST); - typename util::ShM::vector via_node_list( + util::ShM::vector via_node_list( via_node_list_ptr, data_layout->num_entries[storage::SharedDataLayout::VIA_NODE_LIST]); m_via_node_list = std::move(via_node_list); } @@ -193,14 +193,14 @@ class SharedDataFacade final : public BaseDataFacade shared_memory, storage::SharedDataLayout::NAME_OFFSETS); auto blocks_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::NAME_BLOCKS); - typename util::ShM::vector name_offsets( + util::ShM::vector name_offsets( offsets_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_OFFSETS]); - typename util::ShM::vector name_blocks( + util::ShM::vector name_blocks( blocks_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_BLOCKS]); auto names_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::NAME_CHAR_LIST); - typename util::ShM::vector names_char_list( + util::ShM::vector names_char_list( names_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_CHAR_LIST]); m_name_table = util::make_unique>( name_offsets, name_blocks, static_cast(names_char_list.size())); @@ -217,7 +217,7 @@ class SharedDataFacade final : public BaseDataFacade auto core_marker_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::CORE_MARKER); - typename util::ShM::vector is_core_node( + util::ShM::vector is_core_node( core_marker_ptr, data_layout->num_entries[storage::SharedDataLayout::CORE_MARKER]); m_is_core_node = std::move(is_core_node); } @@ -226,7 +226,7 @@ class SharedDataFacade final : public BaseDataFacade { auto geometries_index_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::GEOMETRIES_INDEX); - typename util::ShM::vector geometry_begin_indices( + util::ShM::vector geometry_begin_indices( geometries_index_ptr, data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_INDEX]); m_geometry_indices = std::move(geometry_begin_indices); @@ -234,35 +234,35 @@ class SharedDataFacade final : public BaseDataFacade auto geometries_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::GEOMETRIES_LIST); - typename util::ShM::vector + util::ShM::vector geometry_list(geometries_list_ptr, data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_LIST]); m_geometry_list = std::move(geometry_list); auto datasources_list_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::DATASOURCES_LIST); - typename util::ShM::vector datasources_list( + util::ShM::vector datasources_list( datasources_list_ptr, data_layout->num_entries[storage::SharedDataLayout::DATASOURCES_LIST]); m_datasource_list = std::move(datasources_list); auto datasource_name_data_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_DATA); - typename util::ShM::vector datasource_name_data( + util::ShM::vector datasource_name_data( datasource_name_data_ptr, data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_DATA]); m_datasource_name_data = std::move(datasource_name_data); auto datasource_name_offsets_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS); - typename util::ShM::vector datasource_name_offsets( + util::ShM::vector datasource_name_offsets( datasource_name_offsets_ptr, data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS]); m_datasource_name_offsets = std::move(datasource_name_offsets); auto datasource_name_lengths_ptr = data_layout->GetBlockPtr( shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS); - typename util::ShM::vector datasource_name_lengths( + util::ShM::vector datasource_name_lengths( datasource_name_lengths_ptr, data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS]); m_datasource_name_lengths = std::move(datasource_name_lengths); diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index 67fd122ff..43967dc37 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -39,7 +39,7 @@ namespace osrm namespace storage { -using RTreeLeaf = typename engine::datafacade::BaseDataFacade::RTreeLeaf; +using RTreeLeaf = engine::datafacade::BaseDataFacade::RTreeLeaf; using RTreeNode = util::StaticRTree::vector, true>::TreeNode; using QueryGraph = util::StaticGraph;