[style] cpplint/uncrustify

rclcpp/include/rclcpp/allocator/allocator_deleter.hpp

@@ -16,10 +16,10 @@
 #define RCLCPP__ALLOCATOR__ALLOCATOR_DELETER_HPP_
 
 #include <memory>
+#include <stdexcept>
 
 namespace rclcpp
 {
-
 namespace allocator
 {
 

rclcpp/include/rclcpp/any_executable.hpp

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_ANY_EXECUTABLE_HPP_
-#define RCLCPP_RCLCPP_ANY_EXECUTABLE_HPP_
+#ifndef RCLCPP__ANY_EXECUTABLE_HPP_
+#define RCLCPP__ANY_EXECUTABLE_HPP_
 
 #include <memory>
 
-#include <rclcpp/macros.hpp>
-#include <rclcpp/node.hpp>
+#include "rclcpp/macros.hpp"
+#include "rclcpp/node.hpp"
 #include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp
@@ -44,7 +44,7 @@ struct AnyExecutable
   rclcpp::node::Node::SharedPtr node;
 };
 
-} /* executor */
-} /* rclcpp */
+}  // namespace executor
+}  // namespace rclcpp
 
-#endif
+#endif  // RCLCPP__ANY_EXECUTABLE_HPP_

rclcpp/include/rclcpp/any_service_callback.hpp

@@ -12,18 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_ANY_SERVICE_CALLBACK_HPP_
-#define RCLCPP_RCLCPP_ANY_SERVICE_CALLBACK_HPP_
-
-#include <rclcpp/function_traits.hpp>
+#ifndef RCLCPP__ANY_SERVICE_CALLBACK_HPP_
+#define RCLCPP__ANY_SERVICE_CALLBACK_HPP_
 
 #include <functional>
 #include <memory>
+#include <stdexcept>
 #include <type_traits>
 
-#include <rmw/types.h>
 #include "rclcpp/function_traits.hpp"
 #include "rclcpp/visibility_control.hpp"
+#include "rmw/types.h"
 
 namespace rclcpp
 {
@@ -99,7 +98,7 @@ class AnyServiceCallback
   }
 };
 
-} /* namespace any_service_callback */
-} /* namespace rclcpp */
+}  // namespace any_service_callback
+}  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_ANY_SERVICE_CALLBACK_HPP_ */
+#endif  // RCLCPP__ANY_SERVICE_CALLBACK_HPP_

rclcpp/include/rclcpp/any_subscription_callback.hpp

@@ -19,6 +19,7 @@
 
 #include <functional>
 #include <memory>
+#include <stdexcept>
 #include <type_traits>
 
 #include "rclcpp/allocator/allocator_common.hpp"

rclcpp/include/rclcpp/callback_group.hpp

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_CALLBACK_GROUP_HPP_
-#define RCLCPP_RCLCPP_CALLBACK_GROUP_HPP_
+#ifndef RCLCPP__CALLBACK_GROUP_HPP_
+#define RCLCPP__CALLBACK_GROUP_HPP_
 
 #include <atomic>
 #include <string>
 #include <vector>
 
-#include <rclcpp/subscription.hpp>
-#include <rclcpp/timer.hpp>
-#include <rclcpp/service.hpp>
-#include <rclcpp/client.hpp>
+#include "rclcpp/client.hpp"
+#include "rclcpp/service.hpp"
+#include "rclcpp/subscription.hpp"
+#include "rclcpp/timer.hpp"
 #include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp
@@ -32,7 +32,7 @@ namespace rclcpp
 namespace node
 {
 class Node;
-} // namespace node
+}  // namespace node
 
 namespace callback_group
 {
@@ -102,10 +102,9 @@ class CallbackGroup
   std::vector<rclcpp::service::ServiceBase::SharedPtr> service_ptrs_;
   std::vector<rclcpp::client::ClientBase::SharedPtr> client_ptrs_;
   std::atomic_bool can_be_taken_from_;
-
 };
 
-} /* namespace callback_group */
-} /* namespace rclcpp */
+}  // namespace callback_group
+}  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_CALLBACK_GROUP_HPP_ */
+#endif  // RCLCPP__CALLBACK_GROUP_HPP_

rclcpp/include/rclcpp/client.hpp

@@ -12,32 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_CLIENT_HPP_
-#define RCLCPP_RCLCPP_CLIENT_HPP_
+#ifndef RCLCPP__CLIENT_HPP_
+#define RCLCPP__CLIENT_HPP_
 
 #include <future>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <sstream>
+#include <string>
+#include <tuple>
 #include <utility>
 
-#include <rmw/error_handling.h>
-#include <rmw/rmw.h>
-
-#include <rclcpp/macros.hpp>
-#include <rclcpp/utilities.hpp>
+#include "rclcpp/macros.hpp"
+#include "rclcpp/utilities.hpp"
 #include "rclcpp/visibility_control.hpp"
+#include "rmw/error_handling.h"
+#include "rmw/rmw.h"
 
 namespace rclcpp
 {
-
 namespace client
 {
 
 class ClientBase
 {
-
 public:
   RCLCPP_SMART_PTR_DEFINITIONS_NOT_COPYABLE(ClientBase);
 
@@ -70,7 +68,6 @@ class ClientBase
 
   rmw_client_t * client_handle_;
   std::string service_name_;
-
 };
 
 template<typename ServiceT>
@@ -109,7 +106,8 @@ class Client : public ClientBase
     auto typed_request_header = std::static_pointer_cast<rmw_request_id_t>(request_header);
     auto typed_response = std::static_pointer_cast<typename ServiceT::Response>(response);
     int64_t sequence_number = typed_request_header->sequence_number;
-    // TODO this must check if the sequence_number is valid otherwise the call_promise will be null
+    // TODO(esteve) this must check if the sequence_number is valid otherwise the
+    // call_promise will be null
     auto tuple = this->pending_requests_[sequence_number];
     auto call_promise = std::get<0>(tuple);
     auto callback = std::get<1>(tuple);
@@ -149,7 +147,7 @@ class Client : public ClientBase
   std::map<int64_t, std::tuple<SharedPromise, CallbackType, SharedFuture>> pending_requests_;
 };
 
-} /* namespace client */
-} /* namespace rclcpp */
+}  // namespace client
+}  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_CLIENT_HPP_ */
+#endif  // RCLCPP__CLIENT_HPP_

rclcpp/include/rclcpp/context.hpp

@@ -12,22 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_CONTEXT_HPP_
-#define RCLCPP_RCLCPP_CONTEXT_HPP_
-
-#include <rclcpp/macros.hpp>
+#ifndef RCLCPP__CONTEXT_HPP_
+#define RCLCPP__CONTEXT_HPP_
 
 #include <iostream>
-
 #include <memory>
 #include <mutex>
-#include <typeinfo>
 #include <typeindex>
+#include <typeinfo>
 #include <unordered_map>
 
-#include <rmw/rmw.h>
 #include "rclcpp/macros.hpp"
 #include "rclcpp/visibility_control.hpp"
+#include "rmw/rmw.h"
 
 namespace rclcpp
 {
@@ -73,10 +70,9 @@ class Context
 
   std::unordered_map<std::type_index, std::shared_ptr<void>> sub_contexts_;
   std::mutex mutex_;
-
 };
 
-} /* namespace context */
-} /* namespace rclcpp */
+}  // namespace context
+}  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_CONTEXT_HPP_ */
+#endif  // RCLCPP__CONTEXT_HPP_

rclcpp/include/rclcpp/contexts/default_context.hpp

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_CONTEXTS_DEFAULT_CONTEXT_HPP_
-#define RCLCPP_RCLCPP_CONTEXTS_DEFAULT_CONTEXT_HPP_
+#ifndef RCLCPP__CONTEXTS__DEFAULT_CONTEXT_HPP_
+#define RCLCPP__CONTEXTS__DEFAULT_CONTEXT_HPP_
 
-#include <rclcpp/context.hpp>
+#include "rclcpp/context.hpp"
 #include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp
@@ -38,8 +38,8 @@ RCLCPP_PUBLIC
 DefaultContext::SharedPtr
 get_global_default_context();
 
-} // namespace default_context
-} // namespace contexts
-} // namespace rclcpp
+}  // namespace default_context
+}  // namespace contexts
+}  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_CONTEXTS_DEFAULT_CONTEXT_HPP_ */
+#endif  // RCLCPP__CONTEXTS__DEFAULT_CONTEXT_HPP_

rclcpp/include/rclcpp/executors.hpp

@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_EXECUTORS_HPP_
-#define RCLCPP_RCLCPP_EXECUTORS_HPP_
+#ifndef RCLCPP__EXECUTORS_HPP_
+#define RCLCPP__EXECUTORS_HPP_
 
 #include <future>
-#include <rclcpp/executors/multi_threaded_executor.hpp>
-#include <rclcpp/executors/single_threaded_executor.hpp>
-#include <rclcpp/node.hpp>
-#include <rclcpp/utilities.hpp>
+
+#include "rclcpp/executors/multi_threaded_executor.hpp"
+#include "rclcpp/executors/single_threaded_executor.hpp"
+#include "rclcpp/node.hpp"
+#include "rclcpp/utilities.hpp"
 #include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp
@@ -108,4 +109,4 @@ spin_until_future_complete(
 
 }  // namespace rclcpp
 
-#endif /* RCLCPP_RCLCPP_EXECUTORS_HPP_ */
+#endif  // RCLCPP__EXECUTORS_HPP_

rclcpp/include/rclcpp/executors/multi_threaded_executor.hpp

@@ -15,18 +15,12 @@
 #ifndef RCLCPP__EXECUTORS__MULTI_THREADED_EXECUTOR_HPP_
 #define RCLCPP__EXECUTORS__MULTI_THREADED_EXECUTOR_HPP_
 
-#include <rmw/rmw.h>
-
-#include <cassert>
-#include <cstdlib>
-#include <memory>
 #include <mutex>
-#include <vector>
+#include <thread>
+#include <unordered_map>
 
 #include "rclcpp/executor.hpp"
 #include "rclcpp/macros.hpp"
-#include "rclcpp/node.hpp"
-#include "rclcpp/utilities.hpp"
 #include "rclcpp/memory_strategies.hpp"
 #include "rclcpp/visibility_control.hpp"
 

rclcpp/include/rclcpp/function_traits.hpp

@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_FUNCTION_TRAITS_HPP_
-#define RCLCPP_RCLCPP_FUNCTION_TRAITS_HPP_
+#ifndef RCLCPP__FUNCTION_TRAITS_HPP_
+#define RCLCPP__FUNCTION_TRAITS_HPP_
+
 #include <memory>
+#include <tuple>
+
+#include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp
 {
@@ -95,6 +99,7 @@ struct same_arguments : std::is_same<
     typename function_traits<FunctorBT>::arguments
   >
 {};
-} /* namespace rclcpp */
 
-#endif /* RCLCPP_RCLCPP_FUNCTION_TRAITS_HPP_ */
+}  // namespace rclcpp
+
+#endif  // RCLCPP__FUNCTION_TRAITS_HPP_

rclcpp/include/rclcpp/intra_process_manager_state.hpp

@@ -15,21 +15,21 @@
 #ifndef RCLCPP__INTRA_PROCESS_MANAGER_STATE_HPP_
 #define RCLCPP__INTRA_PROCESS_MANAGER_STATE_HPP_
 
-#include <rclcpp/mapped_ring_buffer.hpp>
-#include <rclcpp/publisher.hpp>
-#include <rclcpp/subscription.hpp>
-
 #include <algorithm>
 #include <atomic>
 #include <functional>
 #include <limits>
-#include <memory>
 #include <map>
-#include <unordered_map>
+#include <memory>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
+#include "rclcpp/macros.hpp"
+#include "rclcpp/mapped_ring_buffer.hpp"
+#include "rclcpp/publisher.hpp"
+#include "rclcpp/subscription.hpp"
 #include "rclcpp/visibility_control.hpp"
 
 namespace rclcpp

rclcpp/include/rclcpp/macros.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP_RCLCPP_MACROS_HPP_
-#define RCLCPP_RCLCPP_MACROS_HPP_
+#ifndef RCLCPP__MACROS_HPP_
+#define RCLCPP__MACROS_HPP_
 
 /* Disables the copy constructor and operator= for the given class.
  *
@@ -76,11 +76,12 @@
   { \
     return std::unique_ptr<__VA_ARGS__>(new __VA_ARGS__(std::forward<Args>(args) ...)); \
   }
+
 /// Defines aliases and static functions for using the Class with unique_ptrs.
 #define RCLCPP_UNIQUE_PTR_DEFINITIONS(...) \
   __RCLCPP_UNIQUE_PTR_ALIAS(__VA_ARGS__) \
   __RCLCPP_MAKE_UNIQUE_DEFINITION(__VA_ARGS__)
 
 #define RCLCPP_INFO(Args) std::cout << Args << std::endl;
 
-#endif /* RCLCPP_RCLCPP_MACROS_HPP_ */
+#endif  // RCLCPP__MACROS_HPP_