Update codes after rebase

Signed-off-by: Barry Xu <[email protected]>

Author: Barry-Xu-2018

rclcpp/src/rclcpp/generic_client.cpp

@@ -34,7 +34,7 @@ GenericClient::GenericClient(
   ts_lib_ = get_typesupport_library(
     service_type, "rosidl_typesupport_cpp");
 
-  auto service_ts_ = get_typesupport_handle<rosidl_service_type_support_t>(
+  auto service_ts_ = get_service_typesupport_handle(
     service_type, "rosidl_typesupport_cpp", *ts_lib_);
 
   auto response_type_support_intro = get_message_typesupport_handle(

rclcpp/test/rclcpp/CMakeLists.txt

@@ -63,6 +63,17 @@ if(TARGET test_create_timer)
   target_link_libraries(test_create_timer ${PROJECT_NAME})
   target_include_directories(test_create_timer PRIVATE ./)
 endif()
+ament_add_gtest(test_generic_client test_generic_client.cpp)
+if(TARGET test_generic_client)
+  target_link_libraries(test_generic_client ${PROJECT_NAME}
+    mimick
+    ${rcl_interfaces_TARGETS}
+    rmw::rmw
+    rosidl_runtime_cpp::rosidl_runtime_cpp
+    rosidl_typesupport_cpp::rosidl_typesupport_cpp
+    ${test_msgs_TARGETS}
+  )
+endif()
 ament_add_gtest(test_create_subscription test_create_subscription.cpp)
 if(TARGET test_create_subscription)
   target_link_libraries(test_create_subscription ${PROJECT_NAME} ${test_msgs_TARGETS})