From 4c1196db44794b7c804b05100a42c65b4e4620b4 Mon Sep 17 00:00:00 2001
From: MarcelPiNacy-CVC <169088301+MarcelPiNacy-CVC@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:44:16 +0200
Subject: [PATCH] Fix linker error. (#8169)

---
 Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp         | 2 +-
 .../Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
index f5595723d..ec45131df 100644
--- a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
+++ b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
@@ -124,7 +124,7 @@ IMPLEMENT_MODULE(FCarlaModule, Carla)
 // -- Implement carla throw_exception ------------------------------------------
 // =============================================================================
 
-#ifndef __cpp_exceptions
+#ifdef LIBCARLA_NO_EXCEPTIONS
 #include <compiler/disable-ue4-macros.h>
 #include <carla/Exception.h>
 #include <compiler/enable-ue4-macros.h>
diff --git a/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
index 3fadb6bbc..71ff7b7e4 100644
--- a/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
+++ b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
@@ -21,7 +21,7 @@ void FCarlaToolsModule::ShutdownModule()
 	
 IMPLEMENT_MODULE(FCarlaToolsModule, CarlaTools)
 
-#ifndef __cpp_exceptions
+#ifdef LIBCARLA_NO_EXCEPTIONS
 #include <compiler/disable-ue4-macros.h>
 #include <carla/Exception.h>
 #include <compiler/enable-ue4-macros.h>