Run clang-format

2016-01-08 01:31:57 +01:00
parent 6b18e4f7e9
commit 6991a38703
149 changed files with 457 additions and 498 deletions
@@ -43,7 +43,6 @@ class CompressedEdgeContainer
    std::vector<unsigned> m_free_list;
    std::unordered_map<EdgeID, unsigned> m_edge_id_to_list_index_map;
 };
-
 }
 }

@@ -117,7 +117,6 @@ class EdgeBasedGraphFactory
    void FlushVectorToStream(std::ofstream &edge_data_file,
                             std::vector<OriginalEdgeData> &original_edge_data_vector) const;
 };
-
 }
 }

@@ -59,7 +59,7 @@ struct EdgeBasedNode
    }

    static inline util::FixedPointCoordinate Centroid(const util::FixedPointCoordinate &a,
-                                                const util::FixedPointCoordinate &b)
+                                                      const util::FixedPointCoordinate &b)
    {
        util::FixedPointCoordinate centroid;
        // The coordinates of the midpoint are given by:
@@ -89,7 +89,6 @@ struct EdgeBasedNode
    TravelMode forward_travel_mode : 4;
    TravelMode backward_travel_mode : 4;
 };
-
 }
 }

@@ -31,7 +31,6 @@ struct ExternalMemoryNodeSTXXLCompare
    value_type max_value();
    value_type min_value();
 };
-
 }
 }

@@ -65,7 +65,6 @@ class ExtractionContainers
                     const std::string &names_file_name,
                     lua_State *segment_state);
 };
-
 }
 }

@@ -94,7 +94,6 @@ unsigned parseDuration(const std::string &s)

    return std::numeric_limits<unsigned>::max();
 }
-
 }
 }

@@ -13,7 +13,6 @@ struct ExtractionNode
    bool traffic_lights;
    bool barrier;
 };
-
 }
 }

@@ -103,7 +103,6 @@ struct ExtractionWay
    TravelMode forward_travel_mode : 4;
    TravelMode backward_travel_mode : 4;
 };
-
 }
 }

@@ -51,7 +51,6 @@ class ExtractorCallbacks
    // warning: caller needs to take care of synchronization!
    void ProcessWay(const osmium::Way &current_way, const ExtractionWay &result_way);
 };
-
 }
 }

@@ -52,7 +52,6 @@ struct ExtractorOptions

    static void GenerateOutputFilesNames(ExtractorConfig &extractor_config);
 };
-
 }
 }

@@ -53,7 +53,6 @@ struct FirstAndLastSegmentOfWayStxxlCompare
    value_type max_value() { return FirstAndLastSegmentOfWay::max_value(); }
    value_type min_value() { return FirstAndLastSegmentOfWay::min_value(); }
 };
-
 }
 }

@@ -37,7 +37,6 @@ class GraphCompressor

    SpeedProfileProperties speed_profile;
 };
-
 }
 }

@@ -94,7 +94,6 @@ struct EdgeBasedEdge
    bool forward : 1;
    bool backward : 1;
 };
-
 }
 }

@@ -152,7 +152,6 @@ struct CmpEdgeByOSMTargetID
    value_type max_value() { return InternalExtractorEdge::max_osm_value(); }
    value_type min_value() { return InternalExtractorEdge::min_osm_value(); }
 };
-
 }
 }

@@ -15,7 +15,6 @@ struct Cmp
    value_type max_value() { return MAX_OSM_NODEID; }
    value_type min_value() { return MIN_OSM_NODEID; }
 };
-
 }
 }

@@ -37,7 +37,6 @@ struct OriginalEdgeData
    bool compressed_geometry;
    TravelMode travel_mode;
 };
-
 }
 }

@@ -59,7 +59,6 @@ struct QueryNode
        return std::numeric_limits<int>::lowest();
    }
 };
-
 }
 }

@@ -149,7 +149,6 @@ class SourceContainer
    std::vector<RasterSource> LoadedSources;
    std::unordered_map<std::string, int> LoadedSourcePaths;
 };
-
 }
 }

@@ -108,7 +108,6 @@ struct CmpRestrictionContainerByTo
    value_type max_value() const { return InputRestrictionContainer::max_value(); }
    value_type min_value() const { return InputRestrictionContainer::min_value(); }
 };
-
 }
 }

@@ -64,7 +64,6 @@ template <> struct hash<osrm::extractor::RestrictionTarget>
 };
 }

-
 namespace osrm
 {
 namespace extractor
@@ -157,7 +156,6 @@ class RestrictionMap
    std::unordered_set<NodeID> m_restriction_start_nodes;
    std::unordered_set<NodeID> m_no_turn_via_node_set;
 };
-
 }
 }

@@ -14,7 +14,6 @@ namespace osmium
 class Relation;
 }

-
 namespace osrm
 {
 namespace extractor
@@ -52,7 +51,6 @@ class RestrictionParser
    std::vector<std::string> restriction_exceptions;
    bool use_turn_restrictions;
 };
-
 }
 }

@@ -34,7 +34,6 @@ class ScriptingEnvironment
    std::string file_name;
    tbb::enumerable_thread_specific<std::shared_ptr<lua_State>> script_contexts;
 };
-
 }
 }

@@ -17,7 +17,6 @@ struct SpeedProfileProperties
    int u_turn_penalty;
    bool has_turn_penalty_function;
 };
-
 }
 }

@@ -147,7 +147,7 @@ template <typename GraphT> class TarjanSCC
                        if (size_of_current_component > 1000)
                        {
                            util::SimpleLogger().Write() << "large component [" << component_index
-                                                   << "]=" << size_of_current_component;
+                                                         << "]=" << size_of_current_component;
                        }

                        ++component_index;
@@ -178,7 +178,6 @@ template <typename GraphT> class TarjanSCC

    unsigned get_component_id(const NodeID node) const { return components_index[node]; }
 };
-
 }
 }

@@ -7,11 +7,11 @@ namespace extractor
 {

 using TravelMode = unsigned char;
-
 }
 }

-namespace {
+namespace
+{
 static const osrm::extractor::TravelMode TRAVEL_MODE_INACCESSIBLE = 0;
 static const osrm::extractor::TravelMode TRAVEL_MODE_DEFAULT = 1;
 }
@@ -79,7 +79,6 @@ struct TurnInstructionsClass
        return true;
    }
 };
-
 }
 }