From 76a51b9010253780e1240069c8523a130f32f0ad Mon Sep 17 00:00:00 2001 From: bernat Date: Tue, 20 Jul 2021 20:30:50 +0200 Subject: [PATCH] Removing spaces --- LibCarla/source/carla/client/Map.cpp | 3 +-- LibCarla/source/carla/client/detail/Simulator.cpp | 2 +- .../Plugins/Carla/Source/Carla/Server/CarlaServer.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/LibCarla/source/carla/client/Map.cpp b/LibCarla/source/carla/client/Map.cpp index bcc081cd4..0f39a92f4 100644 --- a/LibCarla/source/carla/client/Map.cpp +++ b/LibCarla/source/carla/client/Map.cpp @@ -16,7 +16,7 @@ namespace carla { namespace client { - + static auto MakeMap(const std::string &opendrive_contents) { auto stream = std::istringstream(opendrive_contents); auto map = opendrive::OpenDriveParser::Load(stream.str()); @@ -29,7 +29,6 @@ namespace client { Map::Map(rpc::MapInfo description, std::string xodr_content) : _description(std::move(description)), _map(MakeMap(xodr_content)){} - Map::Map(std::string name, std::string xodr_content) : Map(rpc::MapInfo{ diff --git a/LibCarla/source/carla/client/detail/Simulator.cpp b/LibCarla/source/carla/client/detail/Simulator.cpp index 30ef714ff..728160a28 100644 --- a/LibCarla/source/carla/client/detail/Simulator.cpp +++ b/LibCarla/source/carla/client/detail/Simulator.cpp @@ -172,7 +172,7 @@ namespace detail { _open_drive_file = _client.GetMapData(); _cached_map = MakeShared(map_info, _open_drive_file); } - + return _cached_map; } diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp index bfe5cfc62..0a338fe7a 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/CarlaServer.cpp @@ -374,7 +374,7 @@ void FCarlaServer::FPimpl::BindActions() if (folder[folder.size() - 1] != '/' && folder[folder.size() - 1] != '\\') { folder += "/"; } - + // Get the map's folder absolute path and check if it's in its own folder const auto mapDir = FPaths::GetPath(UCarlaStatics::GetGameInstance(Episode->GetWorld())->GetMapPath()); const auto folderDir = mapDir + "/" + folder.c_str(); @@ -394,7 +394,7 @@ void FCarlaServer::FPimpl::BindActions() return result; }; - + BIND_SYNC(request_file) << [this](std::string name) -> R> { REQUIRE_CARLA_EPISODE();