From 8ac848bbc2b1f5e5ce2d53b9085942dada67eb7e Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@openrobotics.org>
Date: Fri, 17 Dec 2021 13:23:44 -0500
Subject: [PATCH] Fixes for uncrustify 0.72 (#1844)

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
---
 rclcpp/include/rclcpp/function_traits.hpp                     | 4 ++--
 .../rclcpp/wait_set_policies/sequential_synchronization.hpp   | 2 +-
 .../rclcpp/wait_set_policies/thread_safe_synchronization.hpp  | 2 +-
 rclcpp/test/utils/rclcpp_gtest_macros.hpp                     | 4 ++--
 rclcpp_action/src/client.cpp                                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rclcpp/include/rclcpp/function_traits.hpp b/rclcpp/include/rclcpp/function_traits.hpp
index 4004476842..4dd3cc28db 100644
--- a/rclcpp/include/rclcpp/function_traits.hpp
+++ b/rclcpp/include/rclcpp/function_traits.hpp
@@ -83,7 +83,7 @@ template<typename ClassT, typename ReturnTypeT, typename ... Args, typename ...
 #if defined _LIBCPP_VERSION  // libc++ (Clang)
 struct function_traits<std::__bind<ReturnTypeT (ClassT::*)(Args ...), FArgs ...>>
 #elif defined _GLIBCXX_RELEASE  // glibc++ (GNU C++ >= 7.1)
-struct function_traits<std::_Bind<ReturnTypeT(ClassT::*(FArgs ...))(Args ...)>>
+struct function_traits<std::_Bind<ReturnTypeT(ClassT::* (FArgs ...))(Args ...)>>
 #elif defined __GLIBCXX__  // glibc++ (GNU C++)
 struct function_traits<std::_Bind<std::_Mem_fn<ReturnTypeT (ClassT::*)(Args ...)>(FArgs ...)>>
 #elif defined _MSC_VER  // MS Visual Studio
@@ -100,7 +100,7 @@ template<typename ClassT, typename ReturnTypeT, typename ... Args, typename ...
 #if defined _LIBCPP_VERSION  // libc++ (Clang)
 struct function_traits<std::__bind<ReturnTypeT (ClassT::*)(Args ...) const, FArgs ...>>
 #elif defined _GLIBCXX_RELEASE  // glibc++ (GNU C++ >= 7.1)
-struct function_traits<std::_Bind<ReturnTypeT(ClassT::*(FArgs ...))(Args ...) const>>
+struct function_traits<std::_Bind<ReturnTypeT(ClassT::* (FArgs ...))(Args ...) const>>
 #elif defined __GLIBCXX__  // glibc++ (GNU C++)
 struct function_traits<std::_Bind<std::_Mem_fn<ReturnTypeT (ClassT::*)(Args ...) const>(FArgs ...)>>
 #elif defined _MSC_VER  // MS Visual Studio
diff --git a/rclcpp/include/rclcpp/wait_set_policies/sequential_synchronization.hpp b/rclcpp/include/rclcpp/wait_set_policies/sequential_synchronization.hpp
index 5ebf32bb72..be2e569c40 100644
--- a/rclcpp/include/rclcpp/wait_set_policies/sequential_synchronization.hpp
+++ b/rclcpp/include/rclcpp/wait_set_policies/sequential_synchronization.hpp
@@ -203,7 +203,7 @@ class SequentialSynchronization : public detail::SynchronizationPolicyCommon
     std::shared_ptr<rclcpp::Waitable> && waitable,
     std::shared_ptr<void> && associated_entity,
     std::function<
-      void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void>&&)
+      void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void> &&)
     > add_waitable_function)
   {
     // Explicitly no thread synchronization.
diff --git a/rclcpp/include/rclcpp/wait_set_policies/thread_safe_synchronization.hpp b/rclcpp/include/rclcpp/wait_set_policies/thread_safe_synchronization.hpp
index ea74769ad4..4a4fb16547 100644
--- a/rclcpp/include/rclcpp/wait_set_policies/thread_safe_synchronization.hpp
+++ b/rclcpp/include/rclcpp/wait_set_policies/thread_safe_synchronization.hpp
@@ -216,7 +216,7 @@ class ThreadSafeSynchronization : public detail::SynchronizationPolicyCommon
     std::shared_ptr<rclcpp::Waitable> && waitable,
     std::shared_ptr<void> && associated_entity,
     std::function<
-      void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void>&&)
+      void(std::shared_ptr<rclcpp::Waitable>&&, std::shared_ptr<void> &&)
     > add_waitable_function)
   {
     using rclcpp::wait_set_policies::detail::WritePreferringReadWriteLock;
diff --git a/rclcpp/test/utils/rclcpp_gtest_macros.hpp b/rclcpp/test/utils/rclcpp_gtest_macros.hpp
index a7b1b97d77..7dd708f974 100644
--- a/rclcpp/test/utils/rclcpp_gtest_macros.hpp
+++ b/rclcpp/test/utils/rclcpp_gtest_macros.hpp
@@ -162,7 +162,7 @@ ::testing::AssertionResult AreThrowableContentsEqual(
 #define RCLCPP_EXPECT_THROW_EQ(throwing_statement, expected_exception) \
   do { \
     ::testing::AssertionResult \
-    is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
+      is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
       ::testing::AssertionSuccess(); \
     CHECK_THROW_EQ_IMPL( \
       throwing_statement, \
@@ -183,7 +183,7 @@ ::testing::AssertionResult AreThrowableContentsEqual(
 #define RCLCPP_ASSERT_THROW_EQ(throwing_statement, expected_exception) \
   do { \
     ::testing::AssertionResult \
-    is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
+      is_the_result_of_the_throwing_expression_equal_to_the_expected_throwable = \
       ::testing::AssertionSuccess(); \
     CHECK_THROW_EQ_IMPL( \
       throwing_statement, \
diff --git a/rclcpp_action/src/client.cpp b/rclcpp_action/src/client.cpp
index 84559bfa9e..2f39a50e52 100644
--- a/rclcpp_action/src/client.cpp
+++ b/rclcpp_action/src/client.cpp
@@ -44,7 +44,7 @@ class ClientBaseImpl
   : node_graph_(node_graph),
     node_handle(node_base->get_shared_rcl_node_handle()),
     logger(node_logging->get_logger().get_child("rclcpp_action")),
-    random_bytes_generator(std::random_device{} ())
+    random_bytes_generator(std::random_device{}())
   {
     std::weak_ptr<rcl_node_t> weak_node_handle(node_handle);
     client_handle = std::shared_ptr<rcl_action_client_t>(