From 001aba6904be25e648abd4528127ff7154064972 Mon Sep 17 00:00:00 2001 From: Fabian Reister <fabian.reister@kit.edu> Date: Mon, 23 Dec 2024 12:17:50 +0100 Subject: [PATCH] fix for ubuntu 24 / GCC 13: LocalException() << STREAM... failure due to wrong include order --- source/devices/ethercat/head/armar6/Device.cpp | 2 +- source/devices/ethercat/head/armar6/Device.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/devices/ethercat/head/armar6/Device.cpp b/source/devices/ethercat/head/armar6/Device.cpp index ebe274d9..ab83020b 100644 --- a/source/devices/ethercat/head/armar6/Device.cpp +++ b/source/devices/ethercat/head/armar6/Device.cpp @@ -30,7 +30,7 @@ #include <ArmarXCore/core/exceptions/local/ExpressionException.h> #include <ArmarXCore/core/logging/Logging.h> -#include <ArmarXCore/core/logging/LoggingUtil.h> // NEEDS TO BE INCLUDED BEFORE ExpressionException.h +#include <ArmarXCore/core/logging/LoggingUtil.h> // NEEDS TO BE INCLUDED BEFORE ExpressionException.h, also consider includes in header ... #include "joint_controller/EmergencyStop.h" #include "joint_controller/PWM.h" diff --git a/source/devices/ethercat/head/armar6/Device.h b/source/devices/ethercat/head/armar6/Device.h index e1ad8a7c..01381024 100644 --- a/source/devices/ethercat/head/armar6/Device.h +++ b/source/devices/ethercat/head/armar6/Device.h @@ -25,6 +25,8 @@ #pragma once +// DO NOT REMOVE. NEEDS TO BE INCLUDED BEFORE ExpressionException.h for `LocalException() << ` construct in cpp. +#include <ArmarXCore/core/logging/LoggingUtil.h> #include <RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h> #include <RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h> -- GitLab