address review comments

Signed-off-by: William Woodall <william@osrfoundation.org>

rclcpp/include/rclcpp/executor_options.hpp

@@ -1,4 +1,4 @@
-// Copyright 2014 Open Source Robotics Foundation, Inc.
+// Copyright 2014-2020 Open Source Robotics Foundation, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -43,6 +43,14 @@ namespace executor
 
 using ExecutorArgs [[deprecated("use rclcpp::ExecutorOptions instead")]] = ExecutorOptions;
 
+[[deprecated("use rclcpp::ExecutorOptions() instead")]]
+inline
+ExecutorArgs
+create_default_executor_arguments()
+{
+  return ExecutorArgs();
+}
+
 }  // namespace executor
 }  // namespace rclcpp
 

rclcpp/include/rclcpp/future_return_code.hpp

@@ -47,6 +47,14 @@ namespace executor
 
 using FutureReturnCode [[deprecated("use rclcpp::FutureReturnCode instead")]] = FutureReturnCode;
 
+[[deprecated("use rclcpp::to_string(const rclcpp::FutureReturnCode &) instead")]]
+inline
+std::string
+to_string(const FutureReturnCode & future_return_code)
+{
+  return rclcpp::to_string(future_return_code);
+}
+
 }  // namespace executor
 }  // namespace rclcpp
 

rclcpp_components/src/component_manager.cpp

@@ -22,7 +22,6 @@
 
 #include "ament_index_cpp/get_resource.hpp"
 #include "class_loader/class_loader.hpp"
-#include "rclcpp/rclcpp.hpp"
 #include "rcpputils/filesystem_helper.hpp"
 #include "rcpputils/split.hpp"