Remove intrinsics functions errors by reodering the includes

LibCarla/source/compiler/enable-ue4-macros.h

@@ -5,18 +5,18 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
 #ifdef LIBCARLA_INCLUDED_DISABLE_UE4_MACROS_HEADER
-  #pragma pop_macro("check")
-  #pragma pop_macro("TEXT")
-
   #if defined(_MSC_VER)
   #  pragma warning(pop)
   #endif
 
-  #if defined(__clang__)
-  #  pragma clang diagnostic pop
-  #endif
-
   #undef LIBCARLA_INCLUDED_DISABLE_UE4_MACROS_HEADER
 #endif
 
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+
+#pragma pop_macro("check")
+#pragma pop_macro("TEXT")
+
 #undef LIBCARLA_INCLUDED_FROM_UE4

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/DataStream.h

@@ -6,13 +6,11 @@
 
 #pragma once
 
-#include <compiler/disable-ue4-macros.h>
 #include <carla/Buffer.h>
 #include <carla/Optional.h>
 #include <carla/sensor/SensorRegistry.h>
 #include <carla/sensor/s11n/SensorHeaderSerializer.h>
 #include <carla/streaming/Stream.h>
-#include <compiler/enable-ue4-macros.h>
 
 // =============================================================================
 // -- FSensorMessageHeader -----------------------------------------------------

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp

@@ -4,11 +4,11 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
+#include "Engine/TextureRenderTarget2D.h"
+
 #include "Carla.h"
 #include "Carla/Sensor/PixelReader.h"
 
-#include "Engine/TextureRenderTarget2D.h"
-
 // For now we only support Vulkan on Windows.
 #if PLATFORM_WINDOWS
 #  define CARLA_WITH_VULKAN_SUPPORT 1

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.h

@@ -6,14 +6,14 @@
 
 #pragma once
 
+#include "CoreGlobals.h"
+#include "Engine/TextureRenderTarget2D.h"
+
 #include <compiler/disable-ue4-macros.h>
 #include <carla/Buffer.h>
 #include <carla/sensor/SensorRegistry.h>
 #include <compiler/enable-ue4-macros.h>
 
-#include "CoreGlobals.h"
-#include "Engine/TextureRenderTarget2D.h"
-
 // =============================================================================
 // -- FPixelReader -------------------------------------------------------------
 // =============================================================================

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.cpp

@@ -4,16 +4,16 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
+#include "DrawDebugHelpers.h"
+#include "StaticMeshResources.h"
+#include "Engine/CollisionProfile.h"
+#include "Runtime/Engine/Classes/Kismet/KismetMathLibrary.h"
+
 #include "Carla.h"
 #include "Carla/Sensor/RayCastLidar.h"
 
 #include "Carla/Actor/ActorBlueprintFunctionLibrary.h"
 
-#include "DrawDebugHelpers.h"
-#include "Engine/CollisionProfile.h"
-#include "Runtime/Engine/Classes/Kismet/KismetMathLibrary.h"
-#include "StaticMeshResources.h"
-
 FActorDefinition ARayCastLidar::GetSensorDefinition()
 {
   return UActorBlueprintFunctionLibrary::MakeLidarDefinition(TEXT("ray_cast"));
@@ -69,8 +69,8 @@ void ARayCastLidar::Tick(const float DeltaTime)
 
   ReadPoints(DeltaTime);
 
-  auto &Stream = GetDataStream();
-  Stream.Send_GameThread(*this, LidarMeasurement, Stream.PopBufferFromPool());
+  auto &stream = GetDataStream();
+  stream.Send_GameThread(*this, LidarMeasurement, stream.PopBufferFromPool());
 }
 
 void ARayCastLidar::ReadPoints(const float DeltaTime)

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/RayCastLidar.h

@@ -7,12 +7,8 @@
 #pragma once
 
 #include "Carla/Sensor/Sensor.h"
-
 #include "Carla/Sensor/LidarDescription.h"
-
-#include <compiler/disable-ue4-macros.h>
 #include <carla/sensor/s11n/LidarMeasurement.h>
-#include <compiler/enable-ue4-macros.h>
 
 #include "RayCastLidar.generated.h"
 

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SceneCaptureSensor.cpp

@@ -4,15 +4,15 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
-#include "Carla.h"
-#include "Carla/Sensor/SceneCaptureSensor.h"
-
 #include "Components/DrawFrustumComponent.h"
 #include "Components/SceneCaptureComponent2D.h"
 #include "Components/StaticMeshComponent.h"
 #include "Engine/TextureRenderTarget2D.h"
 #include "HighResScreenshot.h"
 
+#include "Carla.h"
+#include "Carla/Sensor/SceneCaptureSensor.h"
+
 static auto SCENE_CAPTURE_COUNTER = 0u;
 
 // =============================================================================

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/SensorFactory.cpp

@@ -9,9 +9,9 @@
 
 #include "Carla/Sensor/Sensor.h"
 
-#include <compiler/disable-ue4-macros.h>
+
 #include <carla/sensor/SensorRegistry.h>
-#include <compiler/enable-ue4-macros.h>
+
 
 #define LIBCARLA_SENSOR_REGISTRY_WITH_SENSOR_INCLUDES
 #include <carla/sensor/SensorRegistry.h>

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/ShaderBasedSensor.cpp

@@ -4,11 +4,11 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
+#include "ConstructorHelpers.h"
+
 #include "Carla.h"
 #include "Carla/Sensor/ShaderBasedSensor.h"
 
-#include "ConstructorHelpers.h"
-
 bool AShaderBasedSensor::LoadPostProcessingMaterial(const FString &Path, const float Weight)
 {
   ConstructorHelpers::FObjectFinder<UMaterial> Loader(*Path);

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Server/TheNewCarlaServer.cpp

@@ -4,23 +4,27 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
+#include "GameFramework/SpectatorPawn.h"
+
 #include "Carla.h"
 #include "Carla/Server/TheNewCarlaServer.h"
 
 #include "Carla/Sensor/Sensor.h"
 
-#include "GameFramework/SpectatorPawn.h"
+
+#include <carla/Version.h>
 
 #include <compiler/disable-ue4-macros.h>
-#include <carla/Version.h>
 #include <carla/rpc/Actor.h>
+#include <carla/rpc/VehicleControl.h>
+#include <compiler/enable-ue4-macros.h>
+
 #include <carla/rpc/ActorDefinition.h>
 #include <carla/rpc/ActorDescription.h>
 #include <carla/rpc/Server.h>
 #include <carla/rpc/Transform.h>
-#include <carla/rpc/VehicleControl.h>
 #include <carla/streaming/Server.h>
-#include <compiler/enable-ue4-macros.h>
+
 
 #include <vector>