p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix linux compilation errors

This commit is contained in:
nsubiron 2017-03-13 19:46:44 +01:00
parent 8c8caf02cd
commit cfea96c8e9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Carla/MapGen/GraphGenerator.cpp
View File

@ -96,11 +96,11 @@ namespace MapGen {
const int32 Seed)
{
using Position = typename DoublyConnectedEdgeList::Position;
std::array<Position, 4u> box = {
Position(0, 0),
Position(0, SizeY),
Position(SizeX, SizeY),
Position(SizeX, 0)};
std::array<Position, 4u> box;
box[0u] = Position(0, 0);
box[1u] = Position(0, SizeY);
box[2u] = Position(SizeX, SizeY);
box[3u] = Position(SizeX, 0);
auto Dcel = MakeUnique<DoublyConnectedEdgeList>(box);
randomize(*Dcel, Seed);
return Dcel;

2
Source/Carla/MapGen/Position.h
View File

@ -19,6 +19,8 @@ namespace MapGen {
number_type y;
Position() = default;
constexpr Position(T X, T Y) : x(X), y(Y) {}
constexpr bool operator==(const Position &rhs) const {