From 59a399bbffd2c11c31ff87f600e99029e41831cd Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve@apache.org>
Date: Fri, 14 Aug 2015 14:14:46 -0700
Subject: [PATCH] Replace usage of typedef with using

---
 rclcpp/include/rclcpp/client.hpp       |  8 ++++----
 rclcpp/include/rclcpp/executor.hpp     |  6 +++---
 rclcpp/include/rclcpp/node.hpp         |  6 +++---
 rclcpp/include/rclcpp/rate.hpp         |  4 ++--
 rclcpp/include/rclcpp/rclcpp.hpp       |  2 +-
 rclcpp/include/rclcpp/service.hpp      | 12 ++++++------
 rclcpp/include/rclcpp/subscription.hpp |  2 +-
 rclcpp/include/rclcpp/timer.hpp        |  4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/rclcpp/include/rclcpp/client.hpp b/rclcpp/include/rclcpp/client.hpp
index 024d0f2..9631167 100644
--- a/rclcpp/include/rclcpp/client.hpp
+++ b/rclcpp/include/rclcpp/client.hpp
@@ -93,11 +93,11 @@ template<typename ServiceT>
 class Client : public ClientBase
 {
 public:
-  typedef std::promise<typename ServiceT::Response::SharedPtr> Promise;
-  typedef std::shared_ptr<Promise> SharedPromise;
-  typedef std::shared_future<typename ServiceT::Response::SharedPtr> SharedFuture;
+  using Promise = std::promise<typename ServiceT::Response::SharedPtr>;
+  using SharedPromise = std::shared_ptr<Promise>;
+  using SharedFuture = std::shared_future<typename ServiceT::Response::SharedPtr>;
 
-  typedef std::function<void (SharedFuture)> CallbackType;
+  using CallbackType = std::function<void(SharedFuture)>;
 
   RCLCPP_SMART_PTR_DEFINITIONS(Client);
 
diff --git a/rclcpp/include/rclcpp/executor.hpp b/rclcpp/include/rclcpp/executor.hpp
index e560018..f32daa6 100644
--- a/rclcpp/include/rclcpp/executor.hpp
+++ b/rclcpp/include/rclcpp/executor.hpp
@@ -861,11 +861,11 @@ private:
   RCLCPP_DISABLE_COPY(Executor);
 
   std::vector<std::weak_ptr<rclcpp::node::Node>> weak_nodes_;
-  typedef std::list<void *> SubscriberHandles;
+  using SubscriberHandles = std::list<void *>;
   SubscriberHandles subscriber_handles_;
-  typedef std::list<void *> ServiceHandles;
+  using ServiceHandles = std::list<void *>;
   ServiceHandles service_handles_;
-  typedef std::list<void *> ClientHandles;
+  using ClientHandles = std::list<void *>;
   ClientHandles client_handles_;
 
 };
diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
index 61a916d..95d916d 100644
--- a/rclcpp/include/rclcpp/node.hpp
+++ b/rclcpp/include/rclcpp/node.hpp
@@ -151,9 +151,9 @@ public:
     rclcpp::timer::CallbackType callback,
     rclcpp::callback_group::CallbackGroup::SharedPtr group = nullptr);
 
-  typedef rclcpp::callback_group::CallbackGroup CallbackGroup;
-  typedef std::weak_ptr<CallbackGroup> CallbackGroupWeakPtr;
-  typedef std::list<CallbackGroupWeakPtr> CallbackGroupWeakPtrList;
+  using CallbackGroup = rclcpp::callback_group::CallbackGroup;
+  using CallbackGroupWeakPtr = std::weak_ptr<CallbackGroup>;
+  using CallbackGroupWeakPtrList = std::list<CallbackGroupWeakPtr>;
 
   /* Create and return a Client. */
   template<typename ServiceT>
diff --git a/rclcpp/include/rclcpp/rate.hpp b/rclcpp/include/rclcpp/rate.hpp
index e3a11cb..b9bbb23 100644
--- a/rclcpp/include/rclcpp/rate.hpp
+++ b/rclcpp/include/rclcpp/rate.hpp
@@ -112,8 +112,8 @@ private:
 
 };
 
-typedef GenericRate<std::chrono::system_clock> Rate;
-typedef GenericRate<std::chrono::steady_clock> WallRate;
+using Rate = GenericRate<std::chrono::system_clock>;
+using WallRate = GenericRate<std::chrono::steady_clock>;
 
 } // namespace rate
 } // namespace rclcpp
diff --git a/rclcpp/include/rclcpp/rclcpp.hpp b/rclcpp/include/rclcpp/rclcpp.hpp
index 35893ac..6d388d1 100644
--- a/rclcpp/include/rclcpp/rclcpp.hpp
+++ b/rclcpp/include/rclcpp/rclcpp.hpp
@@ -60,7 +60,7 @@ using rclcpp::rate::WallRate;
 using rclcpp::timer::GenericTimer;
 using rclcpp::timer::TimerBase;
 using rclcpp::timer::WallTimer;
-typedef rclcpp::context::Context::SharedPtr ContextSharedPtr;
+using ContextSharedPtr = rclcpp::context::Context::SharedPtr;
 using rclcpp::utilities::ok;
 using rclcpp::utilities::shutdown;
 using rclcpp::utilities::init;
diff --git a/rclcpp/include/rclcpp/service.hpp b/rclcpp/include/rclcpp/service.hpp
index 2b94c18..4726b76 100644
--- a/rclcpp/include/rclcpp/service.hpp
+++ b/rclcpp/include/rclcpp/service.hpp
@@ -95,16 +95,16 @@ template<typename ServiceT>
 class Service : public ServiceBase
 {
 public:
-  typedef std::function<
-      void (
+  using CallbackType = std::function<
+      void(
         const std::shared_ptr<typename ServiceT::Request> &,
-        std::shared_ptr<typename ServiceT::Response> &)> CallbackType;
+        std::shared_ptr<typename ServiceT::Response> &)>;
 
-  typedef std::function<
-      void (
+  using CallbackWithHeaderType = std::function<
+      void(
         const std::shared_ptr<rmw_request_id_t> &,
         const std::shared_ptr<typename ServiceT::Request> &,
-        std::shared_ptr<typename ServiceT::Response> &)> CallbackWithHeaderType;
+        std::shared_ptr<typename ServiceT::Response> &)>;
   RCLCPP_SMART_PTR_DEFINITIONS(Service);
 
   Service(
diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
index 297ca3f..141747c 100644
--- a/rclcpp/include/rclcpp/subscription.hpp
+++ b/rclcpp/include/rclcpp/subscription.hpp
@@ -96,7 +96,7 @@ template<typename MessageT>
 class Subscription : public SubscriptionBase
 {
 public:
-  typedef std::function<void (const std::shared_ptr<MessageT> &)> CallbackType;
+  using CallbackType = std::function<void(const std::shared_ptr<MessageT> &)>;
   RCLCPP_SMART_PTR_DEFINITIONS(Subscription);
 
   Subscription(
diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
index ed738d3..2f97740 100644
--- a/rclcpp/include/rclcpp/timer.hpp
+++ b/rclcpp/include/rclcpp/timer.hpp
@@ -40,7 +40,7 @@ class Executor;
 namespace timer
 {
 
-typedef std::function<void ()> CallbackType;
+using CallbackType = std::function<void()>;
 
 class TimerBase
 {
@@ -151,7 +151,7 @@ private:
 
 };
 
-typedef GenericTimer<std::chrono::steady_clock> WallTimer;
+using WallTimer = GenericTimer<std::chrono::steady_clock>;
 
 } /* namespace timer */
 } /* namespace rclcpp */