Fix formating

This commit is contained in:
Patrick Niklaus
2018-02-05 11:40:18 +00:00
committed by Patrick Niklaus
parent 71cfb03738
commit b4cfc8d6e0
22 changed files with 47 additions and 54 deletions
@@ -16,10 +16,10 @@ namespace datafacade
{
/**
* This allocator uses an IPC shared memory block as the data location.
* Many SharedMemoryDataFacade objects can be created that point to the same shared
* memory block.
*/
* This allocator uses an IPC shared memory block as the data location.
* Many SharedMemoryDataFacade objects can be created that point to the same shared
* memory block.
*/
class SharedMemoryAllocator : public ContiguousBlockAllocator
{
public:
+1 -2
View File
@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "extractor/travel_mode.hpp"
#include "util/typedefs.hpp"
#include "util/bearing.hpp"
#include "util/coordinate.hpp"
#include "util/typedefs.hpp"
#include <boost/assert.hpp>
@@ -195,7 +195,6 @@ struct PhantomNodes
PhantomNode source_phantom;
PhantomNode target_phantom;
};
}
}
@@ -35,10 +35,10 @@ template <typename Iterator> struct iso_8601_grammar : qi::grammar<Iterator, uns
using qi::_c;
using qi::_pass;
using qi::_val;
using qi::char_;
using qi::eoi;
using qi::eps;
using qi::uint_;
using qi::char_;
hh = uint2_p[_pass = bind([](unsigned x) { return x < 24; }, _1), _val = _1];
mm = uint2_p[_pass = bind([](unsigned x) { return x < 60; }, _1), _val = _1];
+2 -3
View File
@@ -67,9 +67,8 @@ struct TurnLaneDescription_hash
}
};
using LaneDescriptionMap = util::ConcurrentIDMap<TurnLaneDescription,
LaneDescriptionID,
TurnLaneDescription_hash>;
using LaneDescriptionMap =
util::ConcurrentIDMap<TurnLaneDescription, LaneDescriptionID, TurnLaneDescription_hash>;
using TurnLanesIndexedArray =
std::tuple<std::vector<std::uint32_t>, std::vector<TurnLaneType::Mask>>;
+1 -1
View File
@@ -13,8 +13,8 @@ using extractor::intersection::STRAIGHT_ANGLE;
// if a turn deviates this much from going straight, it will be kept straight
using extractor::intersection::MAXIMAL_ALLOWED_NO_TURN_DEVIATION;
// angle that lies between two nearly indistinguishable roads
using extractor::intersection::NARROW_TURN_ANGLE;
using extractor::intersection::GROUP_ANGLE;
using extractor::intersection::NARROW_TURN_ANGLE;
// angle difference that can be classified as straight, if its the only narrow turn
using extractor::intersection::FUZZY_ANGLE_DIFFERENCE;
+2 -2
View File
@@ -33,12 +33,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace osrm
{
using util::Coordinate;
using util::toFixed;
using util::toFloating;
using util::FixedLatitude;
using util::FixedLongitude;
using util::FloatLatitude;
using util::FloatLongitude;
using util::toFixed;
using util::toFloating;
}
#endif
+1 -1
View File
@@ -32,8 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace osrm
{
using util::exception;
using util::RuntimeError;
using util::exception;
}
#endif
+3 -3
View File
@@ -38,12 +38,12 @@ namespace osrm
{
namespace json = util::json;
using engine::EngineConfig;
using engine::api::MatchParameters;
using engine::api::NearestParameters;
using engine::api::RouteParameters;
using engine::api::TableParameters;
using engine::api::NearestParameters;
using engine::api::TripParameters;
using engine::api::MatchParameters;
using engine::api::TileParameters;
using engine::api::TripParameters;
/**
* Represents a Open Source Routing Machine with access to its services.
-2
View File
@@ -94,7 +94,6 @@ inline std::ostream &operator<<(std::ostream &out, const IntersectionViewData &v
}
}
namespace TurnLaneType
{
inline std::ostream &operator<<(std::ostream &out, const Mask lane_type)
@@ -185,7 +184,6 @@ inline std::ostream &operator<<(std::ostream &out, const LaneDataVector &turn_la
return out;
}
}
}
}
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef OSRM_UTIL_RECTANGLE_HPP
#define OSRM_UTIL_RECTANGLE_HPP
#include "util/coordinate_calculation.hpp"
#include "util/coordinate.hpp"
#include "util/coordinate_calculation.hpp"
#include <boost/assert.hpp>
-1
View File
@@ -28,5 +28,4 @@ inline std::string toOSMLink(const util::Coordinate &c)
}
}
#endif