Skip to content

Commit

Permalink
Run modernizer
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-j-h committed Jan 18, 2016
1 parent a877f8a commit 4b0e1a4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/engine/geospatial_query.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ template <typename RTreeT> class GeospatialQuery

public:
GeospatialQuery(RTreeT &rtree_, std::shared_ptr<CoordinateList> coordinates_)
: rtree(rtree_), coordinates(coordinates_)
: rtree(rtree_), coordinates(std::move(coordinates_))
{
}

Expand Down
5 changes: 3 additions & 2 deletions include/extractor/first_and_last_segment_of_way.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ struct FirstAndLastSegmentOfWay
}

FirstAndLastSegmentOfWay(OSMWayID w, OSMNodeID fs, OSMNodeID ft, OSMNodeID ls, OSMNodeID lt)
: way_id(w), first_segment_source_id(fs), first_segment_target_id(ft),
last_segment_source_id(ls), last_segment_target_id(lt)
: way_id(std::move(w)), first_segment_source_id(std::move(fs)),
first_segment_target_id(std::move(ft)), last_segment_source_id(std::move(ls)),
last_segment_target_id(std::move(lt))
{
}

Expand Down
2 changes: 1 addition & 1 deletion include/extractor/node_based_edge.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ inline NodeBasedEdgeWithOSM::NodeBasedEdgeWithOSM(OSMNodeID source,
startpoint,
travel_mode,
is_split),
osm_source_id(source), osm_target_id(target)
osm_source_id(std::move(source)), osm_target_id(std::move(target))
{
}

Expand Down
3 changes: 2 additions & 1 deletion include/extractor/query_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ struct QueryNode
using key_type = OSMNodeID; // type of NodeID
using value_type = int; // type of lat,lons

explicit QueryNode(int lat, int lon, OSMNodeID node_id) : lat(lat), lon(lon), node_id(node_id)
explicit QueryNode(int lat, int lon, OSMNodeID node_id)
: lat(lat), lon(lon), node_id(std::move(node_id))
{
}
QueryNode()
Expand Down
2 changes: 1 addition & 1 deletion src/tools/datastore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ int main(const int argc, const char *argv[]) try

// Allocate a memory layout in shared memory, deallocate previous
auto *layout_memory = SharedMemoryFactory::Get(layout_region, sizeof(SharedDataLayout));
auto *shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout();
auto shared_layout_ptr = new (layout_memory->Ptr()) SharedDataLayout();

shared_layout_ptr->SetBlockSize<char>(SharedDataLayout::FILE_INDEX_PATH,
file_index_path.length() + 1);
Expand Down

0 comments on commit 4b0e1a4

Please sign in to comment.