From 2ce9897ce9d3036923c32251ee353f48e8559ed8 Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 28 Jul 2021 08:38:25 +0200 Subject: [PATCH] Fixing vehicle name and compilation on windows --- PythonAPI/test/smoke/test_sync.py | 2 +- .../Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PythonAPI/test/smoke/test_sync.py b/PythonAPI/test/smoke/test_sync.py index 43a02b703..c8e707a34 100644 --- a/PythonAPI/test/smoke/test_sync.py +++ b/PythonAPI/test/smoke/test_sync.py @@ -68,7 +68,7 @@ class TestSynchronousMode(SyncSmokeTest): spawn_points = self.world.get_map().get_spawn_points() self.assertNotEqual(len(spawn_points), 0) - car_bp = bp_lib.find('vehicle.mustang.mustang') + car_bp = bp_lib.find('vehicle.ford.mustang') car = self.world.spawn_actor(car_bp, spawn_points[0]) # List of sensors that are not events, these are retrieved every frame sensor_ids = [ diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp index 3c8c7a6db..09f01400c 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/CarlaRecorderEventAdd.cpp @@ -67,12 +67,12 @@ void CarlaRecorderEventAdd::Read(std::ifstream &InFile) //--------------------------------------------- -inline void CarlaRecorderEventsAdd::Clear(void) +void CarlaRecorderEventsAdd::Clear(void) { Events.clear(); } -inline void CarlaRecorderEventsAdd::Add(const CarlaRecorderEventAdd &Event) +void CarlaRecorderEventsAdd::Add(const CarlaRecorderEventAdd &Event) { Events.push_back(std::move(Event)); } @@ -101,4 +101,4 @@ void CarlaRecorderEventsAdd::Write(std::ofstream &OutFile) OutFile.seekp(PosStart, std::ios::beg); WriteValue(OutFile, Total); OutFile.seekp(PosEnd, std::ios::beg); -} \ No newline at end of file +}