From ab0ea25517cbb4ac0eef21af71a24aa48da701c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= <v.mayoralv@gmail.com>
Date: Tue, 2 Apr 2019 19:58:40 +0200
Subject: [PATCH 1/3] logging, remove_const before comparison
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change removes the const value from the logger before
comparing with std::is_same.

Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
---
 rclcpp/resource/logging.hpp.em | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rclcpp/resource/logging.hpp.em b/rclcpp/resource/logging.hpp.em
index 6c4986a853..dab373645e 100644
--- a/rclcpp/resource/logging.hpp.em
+++ b/rclcpp/resource/logging.hpp.em
@@ -95,7 +95,7 @@ def is_supported_feature_combination(feature_combination):
 #define RCLCPP_@(severity)@(suffix)(logger, @(''.join([p + ', ' for p in get_macro_parameters(feature_combination).keys()]))...) \
   do { \
     static_assert( \
-      ::std::is_same<typename std::remove_reference<decltype(logger)>::type, \
+      ::std::is_same<typename std::remove_reference<std::remove_const<decltype(logger)>::type>::type, \
       typename ::rclcpp::Logger>::value, \
       "First argument to logging macros must be an rclcpp::Logger"); \
     RCUTILS_LOG_@(severity)@(suffix)_NAMED( \

From eea1714e6a8662c8498385545b7547532f261c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= <v.mayoralv@gmail.com>
Date: Tue, 2 Apr 2019 21:44:08 +0200
Subject: [PATCH 2/3] logging template, replace remove_const by remove_cv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
---
 rclcpp/resource/logging.hpp.em | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rclcpp/resource/logging.hpp.em b/rclcpp/resource/logging.hpp.em
index dab373645e..2f70d964e7 100644
--- a/rclcpp/resource/logging.hpp.em
+++ b/rclcpp/resource/logging.hpp.em
@@ -95,7 +95,7 @@ def is_supported_feature_combination(feature_combination):
 #define RCLCPP_@(severity)@(suffix)(logger, @(''.join([p + ', ' for p in get_macro_parameters(feature_combination).keys()]))...) \
   do { \
     static_assert( \
-      ::std::is_same<typename std::remove_reference<std::remove_const<decltype(logger)>::type>::type, \
+      ::std::is_same<typename std::remove_reference<std::remove_cv<decltype(logger)>::type>::type, \
       typename ::rclcpp::Logger>::value, \
       "First argument to logging macros must be an rclcpp::Logger"); \
     RCUTILS_LOG_@(severity)@(suffix)_NAMED( \

From b1ddbe373094d26a6ac27295e9d676c97ba73950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mayoral=20Vilches?= <v.mayoralv@gmail.com>
Date: Sat, 13 Apr 2019 20:48:44 +0200
Subject: [PATCH 3/3] Append typename
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Located after compiling rclcpp_action from source

Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
---
 rclcpp/resource/logging.hpp.em | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rclcpp/resource/logging.hpp.em b/rclcpp/resource/logging.hpp.em
index 2f70d964e7..564113487a 100644
--- a/rclcpp/resource/logging.hpp.em
+++ b/rclcpp/resource/logging.hpp.em
@@ -95,7 +95,7 @@ def is_supported_feature_combination(feature_combination):
 #define RCLCPP_@(severity)@(suffix)(logger, @(''.join([p + ', ' for p in get_macro_parameters(feature_combination).keys()]))...) \
   do { \
     static_assert( \
-      ::std::is_same<typename std::remove_reference<std::remove_cv<decltype(logger)>::type>::type, \
+      ::std::is_same<typename std::remove_reference<typename std::remove_cv<decltype(logger)>::type>::type, \
       typename ::rclcpp::Logger>::value, \
       "First argument to logging macros must be an rclcpp::Logger"); \
     RCUTILS_LOG_@(severity)@(suffix)_NAMED( \