From 2b4c653e2e38a9c97d36a9525d420871a82ca0e1 Mon Sep 17 00:00:00 2001 From: CursedRock17 Date: Sun, 10 Dec 2023 23:35:11 -0500 Subject: [PATCH 1/5] Begining Logger Severity Signed-off-by: CursedRock17 --- rclcpp/include/rclcpp/logger.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index 3b8e8a1625..00766f0626 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -24,6 +24,7 @@ #include "rcl/node.h" #include "rcutils/logging.h" #include "rcpputils/filesystem_helper.hpp" +#include "rclcpp/logging.hpp" /** * \def RCLCPP_LOGGING_ENABLED @@ -34,8 +35,7 @@ * This should be used in combination with `RCLCPP_LOG_MIN_SEVERITY` to compile * out logging macros. */ -// TODO(dhood): determine this automatically from `RCLCPP_LOG_MIN_SEVERITY` -#ifndef RCLCPP_LOGGING_ENABLED +#ifdef RCLCPP_LOGG_MIN_SEVERITY_NONE #define RCLCPP_LOGGING_ENABLED 1 #endif From 02f72b0df5629ea14777b6bfb663c4544ef8e397 Mon Sep 17 00:00:00 2001 From: CursedRock17 Date: Mon, 11 Dec 2023 17:55:50 -0500 Subject: [PATCH 2/5] Fixing typo Signed-off-by: CursedRock17 --- rclcpp/include/rclcpp/logger.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index 00766f0626..49441ec585 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -35,7 +35,7 @@ * This should be used in combination with `RCLCPP_LOG_MIN_SEVERITY` to compile * out logging macros. */ -#ifdef RCLCPP_LOGG_MIN_SEVERITY_NONE +#if RCLCPP_LOG_MIN_SEVERITY != RCLCPP_LOG_MIN_SEVERITY_NONE #define RCLCPP_LOGGING_ENABLED 1 #endif From 768956de847f68fcc61f8bfb7692dad35fb4c65e Mon Sep 17 00:00:00 2001 From: CursedRock17 Date: Tue, 12 Dec 2023 22:58:10 -0500 Subject: [PATCH 3/5] Trying a default MACRO init Signed-off-by: CursedRock17 --- rclcpp/include/rclcpp/logger.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index 49441ec585..d229308f2f 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -35,6 +35,10 @@ * This should be used in combination with `RCLCPP_LOG_MIN_SEVERITY` to compile * out logging macros. */ +#ifndef RCLCPP_LOGGING_ENABLED +#define RCLCPP_LOGGING_ENABLED 0 +#endif + #if RCLCPP_LOG_MIN_SEVERITY != RCLCPP_LOG_MIN_SEVERITY_NONE #define RCLCPP_LOGGING_ENABLED 1 #endif From eb41376e6897451efef0b327d542d6650cfa8b3b Mon Sep 17 00:00:00 2001 From: CursedRock17 Date: Sun, 17 Dec 2023 02:14:13 -0500 Subject: [PATCH 4/5] Different style Signed-off-by: CursedRock17 --- rclcpp/include/rclcpp/logger.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index d229308f2f..08087b5152 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -35,14 +35,14 @@ * This should be used in combination with `RCLCPP_LOG_MIN_SEVERITY` to compile * out logging macros. */ -#ifndef RCLCPP_LOGGING_ENABLED -#define RCLCPP_LOGGING_ENABLED 0 -#endif #if RCLCPP_LOG_MIN_SEVERITY != RCLCPP_LOG_MIN_SEVERITY_NONE #define RCLCPP_LOGGING_ENABLED 1 +#else +#define RCLCPP_LOGGING_ENABLED 0 #endif + namespace rclcpp { From 09bfcfe09445a0d694b930bb47811eb40ad960ef Mon Sep 17 00:00:00 2001 From: CursedRock17 Date: Mon, 19 Feb 2024 22:50:48 -0500 Subject: [PATCH 5/5] Rerunning CI Signed-off-by: CursedRock17 --- rclcpp/include/rclcpp/logger.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index 08087b5152..4554492e15 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -42,7 +42,6 @@ #define RCLCPP_LOGGING_ENABLED 0 #endif - namespace rclcpp {