apply to master API (ros-navigation#13)

Karsten1987 · web-flow · commit cd459c70a665 · 2020-02-05T17:12:45.000-08:00
Signed-off-by: Karsten Knese &lt;karsten@openrobotics.org&gt;
diff --git a/ros_controllers/src/trajectory.cpp b/ros_controllers/src/trajectory.cpp
@@ -53,7 +53,8 @@ Trajectory::update(std::shared_ptr<trajectory_msgs::msg::JointTrajectory> joint_
 TrajectoryPointConstIter
 Trajectory::sample(const rclcpp::Time & sample_time)
 {
-  THROW_ON_NULLPTR(trajectory_msg_)
+  // TODO(karsten1987): Enable this for eloquent when `rclcpp::is_pointer` is used
+  // THROW_ON_NULLPTR(trajectory_msg_)
 
   // skip if current time hasn't reached traj time of the first msg yet
   if (time_less_than(sample_time, trajectory_start_time_)) {
@@ -74,15 +75,15 @@ Trajectory::sample(const rclcpp::Time & sample_time)
 TrajectoryPointConstIter
 Trajectory::begin() const
 {
-  THROW_ON_NULLPTR(trajectory_msg_)
+  // THROW_ON_NULLPTR(trajectory_msg_)
 
   return trajectory_msg_->points.begin();
 }
 
 TrajectoryPointConstIter
 Trajectory::end() const
 {
-  THROW_ON_NULLPTR(trajectory_msg_)
+  // THROW_ON_NULLPTR(trajectory_msg_)
 
   return trajectory_msg_->points.end();
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ Trajectory::update(std::shared_ptr<trajectory_msgs::msg::JointTrajectory> joint_`
`53`	`53`	`TrajectoryPointConstIter`
`54`	`54`	`Trajectory::sample(const rclcpp::Time & sample_time)`
`55`	`55`	`{`
`56`		`- THROW_ON_NULLPTR(trajectory_msg_)`
	`56`	+ // TODO(karsten1987): Enable this for eloquent when `rclcpp::is_pointer` is used
	`57`	`+ // THROW_ON_NULLPTR(trajectory_msg_)`
`57`	`58`
`58`	`59`	`// skip if current time hasn't reached traj time of the first msg yet`
`59`	`60`	`if (time_less_than(sample_time, trajectory_start_time_)) {`
`@@ -74,15 +75,15 @@ Trajectory::sample(const rclcpp::Time & sample_time)`
`74`	`75`	`TrajectoryPointConstIter`
`75`	`76`	`Trajectory::begin() const`
`76`	`77`	`{`
`77`		`- THROW_ON_NULLPTR(trajectory_msg_)`
	`78`	`+ // THROW_ON_NULLPTR(trajectory_msg_)`
`78`	`79`
`79`	`80`	`return trajectory_msg_->points.begin();`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`TrajectoryPointConstIter`
`83`	`84`	`Trajectory::end() const`
`84`	`85`	`{`
`85`		`- THROW_ON_NULLPTR(trajectory_msg_)`
	`86`	`+ // THROW_ON_NULLPTR(trajectory_msg_)`
`86`	`87`
`87`	`88`	`return trajectory_msg_->points.end();`
`88`	`89`	`}`