Skip to content
Snippets Groups Projects

Resolve "IsMotion used in Problem::getState()"

Merged Joan Vallvé Navarro requested to merge 399-ismotion-used-in-problem-getstate into devel
All threads resolved!
6 files
+ 285
10
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -178,10 +178,8 @@ class Problem : public std::enable_shared_from_this<Problem>
@@ -178,10 +178,8 @@ class Problem : public std::enable_shared_from_this<Problem>
public:
public:
IsMotionPtr getProcessorIsMotion();
IsMotionPtr getProcessorIsMotion();
std::map<int,IsMotionPtr> getProcessorIsMotionMap();
std::map<int,IsMotionPtr>& getProcessorIsMotionMap();
const std::map<int,IsMotionPtr>& getProcessorIsMotionMap() const;
// Trajectory branch ----------------------------------
// Trajectory branch ----------------------------------
TrajectoryBasePtr getTrajectory() const;
TrajectoryBasePtr getTrajectory() const;
@@ -437,8 +435,12 @@ inline IsMotionPtr Problem::getProcessorIsMotion()
@@ -437,8 +435,12 @@ inline IsMotionPtr Problem::getProcessorIsMotion()
return nullptr;
return nullptr;
}
}
 
inline std::map<int,IsMotionPtr>& Problem::getProcessorIsMotionMap()
 
{
 
return processor_is_motion_map_;
 
}
inline std::map<int,IsMotionPtr> Problem::getProcessorIsMotionMap()
inline const std::map<int,IsMotionPtr>& Problem::getProcessorIsMotionMap() const
{
{
return processor_is_motion_map_;
return processor_is_motion_map_;
}
}
Loading