From 18c0b5e36fd9a93d05242fa3c69a5b01548c3ed5 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Sun, 28 Jul 2024 13:14:48 -0500 Subject: [PATCH] Cleanup boost serialization (#490) --- tesseract_command_language/src/cartesian_waypoint.cpp | 3 ++- tesseract_command_language/src/composite_instruction.cpp | 3 ++- tesseract_command_language/src/joint_waypoint.cpp | 2 +- tesseract_command_language/src/move_instruction.cpp | 3 ++- .../src/poly/cartesian_waypoint_poly.cpp | 8 ++++---- tesseract_command_language/src/poly/instruction_poly.cpp | 8 ++++---- .../src/poly/joint_waypoint_poly.cpp | 8 ++++---- .../src/poly/move_instruction_poly.cpp | 8 ++++---- .../src/poly/state_waypoint_poly.cpp | 8 ++++---- tesseract_command_language/src/poly/waypoint_poly.cpp | 8 ++++---- tesseract_command_language/src/profile_dictionary.cpp | 2 +- tesseract_command_language/src/set_analog_instruction.cpp | 2 +- tesseract_command_language/src/set_tool_instruction.cpp | 2 +- tesseract_command_language/src/state_waypoint.cpp | 2 +- tesseract_command_language/src/timer_instruction.cpp | 2 +- tesseract_command_language/src/wait_instruction.cpp | 2 +- .../tesseract_task_composer/core/nodes/done_task.h | 2 +- .../tesseract_task_composer/core/nodes/error_task.h | 2 +- .../core/nodes/has_data_storage_entry_task.h | 2 +- .../tesseract_task_composer/core/nodes/remap_task.h | 2 +- .../tesseract_task_composer/core/nodes/start_task.h | 2 +- .../tesseract_task_composer/core/nodes/sync_task.h | 2 +- .../tesseract_task_composer/core/task_composer_context.h | 4 +--- .../core/task_composer_data_storage.h | 4 +--- .../tesseract_task_composer/core/task_composer_executor.h | 2 +- .../tesseract_task_composer/core/task_composer_graph.h | 2 +- .../tesseract_task_composer/core/task_composer_keys.h | 4 +--- .../tesseract_task_composer/core/task_composer_node.h | 4 +--- .../core/task_composer_node_info.h | 6 ++---- .../core/task_composer_node_ports.h | 4 +--- .../tesseract_task_composer/core/task_composer_pipeline.h | 2 +- .../tesseract_task_composer/core/task_composer_task.h | 2 +- .../tesseract_task_composer/core/test_suite/test_task.h | 2 +- tesseract_task_composer/core/src/nodes/done_task.cpp | 2 +- tesseract_task_composer/core/src/nodes/error_task.cpp | 2 +- tesseract_task_composer/core/src/nodes/remap_task.cpp | 2 +- tesseract_task_composer/core/src/nodes/start_task.cpp | 2 +- tesseract_task_composer/core/src/nodes/sync_task.cpp | 2 +- .../core/src/task_composer_context.cpp | 3 +-- .../core/src/task_composer_data_storage.cpp | 3 +-- .../core/src/task_composer_executor.cpp | 2 +- tesseract_task_composer/core/src/task_composer_graph.cpp | 2 +- tesseract_task_composer/core/src/task_composer_keys.cpp | 2 +- tesseract_task_composer/core/src/task_composer_node.cpp | 2 +- .../core/src/task_composer_node_info.cpp | 4 ++-- .../core/src/task_composer_node_ports.cpp | 3 +-- .../core/src/task_composer_pipeline.cpp | 2 +- tesseract_task_composer/core/src/task_composer_task.cpp | 2 +- tesseract_task_composer/core/src/test_suite/test_task.cpp | 2 +- .../planning/nodes/continuous_contact_check_task.h | 4 ++-- .../planning/nodes/discrete_contact_check_task.h | 4 ++-- .../planning/nodes/fix_state_bounds_task.h | 2 +- .../planning/nodes/fix_state_collision_task.h | 4 ++-- .../planning/nodes/format_as_input_task.h | 2 +- .../planning/nodes/format_as_result_task.h | 2 +- .../nodes/iterative_spline_parameterization_task.h | 2 +- .../planning/nodes/min_length_task.h | 2 +- .../planning/nodes/motion_planner_task_info.h | 2 +- .../planning/nodes/process_planning_input_task.h | 2 +- .../planning/nodes/profile_switch_task.h | 2 +- .../planning/nodes/raster_motion_task.h | 2 +- .../planning/nodes/raster_only_motion_task.h | 2 +- .../planning/nodes/ruckig_trajectory_smoothing_task.h | 2 +- .../planning/nodes/time_optimal_parameterization_task.h | 4 ++-- .../planning/nodes/update_end_state_task.h | 2 +- .../planning/nodes/update_start_and_end_state_task.h | 2 +- .../planning/nodes/update_start_state_task.h | 2 +- .../planning/nodes/upsample_trajectory_task.h | 2 +- .../planning/src/nodes/continuous_contact_check_task.cpp | 4 ++-- .../planning/src/nodes/discrete_contact_check_task.cpp | 4 ++-- .../planning/src/nodes/fix_state_bounds_task.cpp | 2 +- .../planning/src/nodes/fix_state_collision_task.cpp | 4 ++-- .../planning/src/nodes/format_as_input_task.cpp | 2 +- .../src/nodes/iterative_spline_parameterization_task.cpp | 2 +- .../planning/src/nodes/min_length_task.cpp | 2 +- .../planning/src/nodes/motion_planner_task_info.cpp | 2 +- .../planning/src/nodes/process_planning_input_task.cpp | 2 +- .../planning/src/nodes/profile_switch_task.cpp | 2 +- .../planning/src/nodes/raster_motion_task.cpp | 2 +- .../planning/src/nodes/raster_only_motion_task.cpp | 2 +- .../src/nodes/ruckig_trajectory_smoothing_task.cpp | 2 +- .../src/nodes/time_optimal_parameterization_task.cpp | 4 ++-- .../planning/src/nodes/update_end_state_task.cpp | 2 +- .../src/nodes/update_start_and_end_state_task.cpp | 2 +- .../planning/src/nodes/update_start_state_task.cpp | 2 +- .../planning/src/nodes/upsample_trajectory_task.cpp | 2 +- .../taskflow/taskflow_task_composer_executor.h | 2 +- .../taskflow/src/taskflow_task_composer_executor.cpp | 2 +- 88 files changed, 119 insertions(+), 131 deletions(-) diff --git a/tesseract_command_language/src/cartesian_waypoint.cpp b/tesseract_command_language/src/cartesian_waypoint.cpp index e1e6d2c547..2eb19b2679 100644 --- a/tesseract_command_language/src/cartesian_waypoint.cpp +++ b/tesseract_command_language/src/cartesian_waypoint.cpp @@ -82,5 +82,6 @@ void tesseract_planning::CartesianWaypoint::serialize(Archive& ar, const unsigne } #include + +TESSERACT_CARTESIAN_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::CartesianWaypoint) TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypoint) -TESSERACT_CARTESIAN_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::CartesianWaypoint); diff --git a/tesseract_command_language/src/composite_instruction.cpp b/tesseract_command_language/src/composite_instruction.cpp index d32e8a52e9..e62e48c6dc 100644 --- a/tesseract_command_language/src/composite_instruction.cpp +++ b/tesseract_command_language/src/composite_instruction.cpp @@ -535,6 +535,7 @@ void CompositeInstruction::serialize(Archive& ar, const unsigned int /*version*/ } // namespace tesseract_planning #include -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CompositeInstruction) + TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::CompositeInstruction) TESSERACT_ANY_EXPORT_IMPLEMENT(TesseractPlanningCompositeInstruction) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CompositeInstruction) diff --git a/tesseract_command_language/src/joint_waypoint.cpp b/tesseract_command_language/src/joint_waypoint.cpp index 409d95df03..7327e4412e 100644 --- a/tesseract_command_language/src/joint_waypoint.cpp +++ b/tesseract_command_language/src/joint_waypoint.cpp @@ -114,5 +114,5 @@ void JointWaypoint::serialize(Archive& ar, const unsigned int /*version*/) } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypoint) TESSERACT_JOINT_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::JointWaypoint) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypoint) diff --git a/tesseract_command_language/src/move_instruction.cpp b/tesseract_command_language/src/move_instruction.cpp index 5f842813a0..f00c01c611 100644 --- a/tesseract_command_language/src/move_instruction.cpp +++ b/tesseract_command_language/src/move_instruction.cpp @@ -262,5 +262,6 @@ void MoveInstruction::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning #include -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstruction) + TESSERACT_MOVE_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::MoveInstruction) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstruction) diff --git a/tesseract_command_language/src/poly/cartesian_waypoint_poly.cpp b/tesseract_command_language/src/poly/cartesian_waypoint_poly.cpp index 518274fa47..0a14413e59 100644 --- a/tesseract_command_language/src/poly/cartesian_waypoint_poly.cpp +++ b/tesseract_command_language/src/poly/cartesian_waypoint_poly.cpp @@ -129,12 +129,12 @@ void tesseract_planning::CartesianWaypointPoly::serialize(Archive& ar, const uns ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_cartesian_waypoint::CartesianWaypointInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypointPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypointPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_cartesian_waypoint::CartesianWaypointInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::CartesianWaypointPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::CartesianWaypointPoly) TESSERACT_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::CartesianWaypointPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_cartesian_waypoint::CartesianWaypointInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypointPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypointPoly) diff --git a/tesseract_command_language/src/poly/instruction_poly.cpp b/tesseract_command_language/src/poly/instruction_poly.cpp index b6581a6e52..18a23d773d 100644 --- a/tesseract_command_language/src/poly/instruction_poly.cpp +++ b/tesseract_command_language/src/poly/instruction_poly.cpp @@ -61,10 +61,10 @@ void tesseract_planning::InstructionPoly::serialize(Archive& ar, const unsigned ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_instruction::InstructionInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::InstructionPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::InstructionPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_instruction::InstructionInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::InstructionPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::InstructionPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_instruction::InstructionInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::InstructionPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::InstructionPoly) diff --git a/tesseract_command_language/src/poly/joint_waypoint_poly.cpp b/tesseract_command_language/src/poly/joint_waypoint_poly.cpp index 3449eab303..90af5b0ea4 100644 --- a/tesseract_command_language/src/poly/joint_waypoint_poly.cpp +++ b/tesseract_command_language/src/poly/joint_waypoint_poly.cpp @@ -122,12 +122,12 @@ void tesseract_planning::JointWaypointPoly::serialize(Archive& ar, const unsigne ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_joint_waypoint::JointWaypointInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypointPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypointPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_joint_waypoint::JointWaypointInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::JointWaypointPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::JointWaypointPoly) TESSERACT_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::JointWaypointPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_joint_waypoint::JointWaypointInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypointPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::JointWaypointPoly) diff --git a/tesseract_command_language/src/poly/move_instruction_poly.cpp b/tesseract_command_language/src/poly/move_instruction_poly.cpp index f1918ce42a..786d51c47b 100644 --- a/tesseract_command_language/src/poly/move_instruction_poly.cpp +++ b/tesseract_command_language/src/poly/move_instruction_poly.cpp @@ -171,12 +171,12 @@ void tesseract_planning::MoveInstructionPoly::serialize(Archive& ar, const unsig ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_move_instruction::MoveInstructionInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstructionPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstructionPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_move_instruction::MoveInstructionInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::MoveInstructionPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::MoveInstructionPoly) TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::MoveInstructionPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_move_instruction::MoveInstructionInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstructionPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstructionPoly) diff --git a/tesseract_command_language/src/poly/state_waypoint_poly.cpp b/tesseract_command_language/src/poly/state_waypoint_poly.cpp index 2691bb19c0..1b2b0b30ce 100644 --- a/tesseract_command_language/src/poly/state_waypoint_poly.cpp +++ b/tesseract_command_language/src/poly/state_waypoint_poly.cpp @@ -101,12 +101,12 @@ void tesseract_planning::StateWaypointPoly::serialize(Archive& ar, const unsigne ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_state_waypoint::StateWaypointInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypointPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypointPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_state_waypoint::StateWaypointInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::StateWaypointPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::StateWaypointPoly) TESSERACT_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::StateWaypointPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_state_waypoint::StateWaypointInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypointPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypointPoly) diff --git a/tesseract_command_language/src/poly/waypoint_poly.cpp b/tesseract_command_language/src/poly/waypoint_poly.cpp index fbfc64293b..aec0c6ad0c 100644 --- a/tesseract_command_language/src/poly/waypoint_poly.cpp +++ b/tesseract_command_language/src/poly/waypoint_poly.cpp @@ -43,10 +43,10 @@ void tesseract_planning::WaypointPoly::serialize(Archive& ar, const unsigned int ar& boost::serialization::make_nvp("base", boost::serialization::base_object(*this)); } -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_waypoint::WaypointInterface) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::WaypointPolyBase) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::WaypointPoly) - BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::detail_waypoint::WaypointInterface) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::WaypointPolyBase) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::WaypointPoly) + +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::detail_waypoint::WaypointInterface) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::WaypointPolyBase) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::WaypointPoly) diff --git a/tesseract_command_language/src/profile_dictionary.cpp b/tesseract_command_language/src/profile_dictionary.cpp index b1305ef10f..00a2c57b7e 100644 --- a/tesseract_command_language/src/profile_dictionary.cpp +++ b/tesseract_command_language/src/profile_dictionary.cpp @@ -44,5 +44,5 @@ void ProfileDictionary::serialize(Archive& /*ar*/, const unsigned int /*version* #include BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ProfileDictionary) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileDictionary) TESSERACT_ANY_EXPORT_IMPLEMENT(TesseractPlanningProfileDictionarySharedPtr) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileDictionary) diff --git a/tesseract_command_language/src/set_analog_instruction.cpp b/tesseract_command_language/src/set_analog_instruction.cpp index df85388fab..35355d06e5 100644 --- a/tesseract_command_language/src/set_analog_instruction.cpp +++ b/tesseract_command_language/src/set_analog_instruction.cpp @@ -101,5 +101,5 @@ void SetAnalogInstruction::serialize(Archive& ar, const unsigned int /*version*/ } // namespace tesseract_planning #include +TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::SetAnalogInstruction) TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SetAnalogInstruction) -TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::SetAnalogInstruction); diff --git a/tesseract_command_language/src/set_tool_instruction.cpp b/tesseract_command_language/src/set_tool_instruction.cpp index 225c6708ae..af361bd2b3 100644 --- a/tesseract_command_language/src/set_tool_instruction.cpp +++ b/tesseract_command_language/src/set_tool_instruction.cpp @@ -89,5 +89,5 @@ void SetToolInstruction::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SetToolInstruction) TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::SetToolInstruction) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SetToolInstruction) diff --git a/tesseract_command_language/src/state_waypoint.cpp b/tesseract_command_language/src/state_waypoint.cpp index db39c88a94..26374d89a7 100644 --- a/tesseract_command_language/src/state_waypoint.cpp +++ b/tesseract_command_language/src/state_waypoint.cpp @@ -133,5 +133,5 @@ void StateWaypoint::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypoint) TESSERACT_STATE_WAYPOINT_EXPORT_IMPLEMENT(tesseract_planning::StateWaypoint) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StateWaypoint) diff --git a/tesseract_command_language/src/timer_instruction.cpp b/tesseract_command_language/src/timer_instruction.cpp index 464e7d3df8..e1d9d1fe62 100644 --- a/tesseract_command_language/src/timer_instruction.cpp +++ b/tesseract_command_language/src/timer_instruction.cpp @@ -107,5 +107,5 @@ void TimerInstruction::serialize(Archive& ar, const unsigned int /*version*/) } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimerInstruction) TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::TimerInstruction) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimerInstruction) diff --git a/tesseract_command_language/src/wait_instruction.cpp b/tesseract_command_language/src/wait_instruction.cpp index 72afc5817d..79ebf53d1b 100644 --- a/tesseract_command_language/src/wait_instruction.cpp +++ b/tesseract_command_language/src/wait_instruction.cpp @@ -108,5 +108,5 @@ void WaitInstruction::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning #include +TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::WaitInstruction) TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::WaitInstruction) -TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::WaitInstruction); diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/done_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/done_task.h index 95b6cbeeaa..5cebb27f7c 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/done_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/done_task.h @@ -64,6 +64,6 @@ class DoneTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::DoneTask, "DoneTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::DoneTask) #endif // TESSERACT_TASK_COMPOSER_DONE_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/error_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/error_task.h index ba61b09487..ef309359ba 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/error_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/error_task.h @@ -64,6 +64,6 @@ class ErrorTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::ErrorTask, "ErrorTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::ErrorTask) #endif // TESSERACT_TASK_COMPOSER_ERROR_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/has_data_storage_entry_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/has_data_storage_entry_task.h index 58c8942002..58d464a1e0 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/has_data_storage_entry_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/has_data_storage_entry_task.h @@ -49,6 +49,6 @@ class HasDataStorageEntryTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::HasDataStorageEntryTask, "HasDataStorageEntryTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::HasDataStorageEntryTask) #endif // TESSERACT_TASK_COMPOSER_HAS_DATA_STORAGE_ENTRY_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/remap_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/remap_task.h index fd2eda1a0d..47f0a70711 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/remap_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/remap_task.h @@ -71,5 +71,5 @@ class RemapTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::RemapTask, "RemapTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::RemapTask) #endif // TESSERACT_TASK_COMPOSER_REMAP_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/start_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/start_task.h index 605b16e8bf..b49d9ff25e 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/start_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/start_task.h @@ -63,6 +63,6 @@ class StartTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::StartTask, "StartTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::StartTask) #endif // TESSERACT_TASK_COMPOSER_START_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/sync_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/sync_task.h index 62ae11e580..fc6ca4be75 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/sync_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/nodes/sync_task.h @@ -73,6 +73,6 @@ class SyncTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::SyncTask, "SyncTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::SyncTask) #endif // TESSERACT_TASK_COMPOSER_SYNC_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_context.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_context.h index c841aa91d2..c61201d98f 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_context.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_context.h @@ -129,7 +129,5 @@ class TaskComposerContext mutable std::atomic aborted_{ false }; }; } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerContext, "TaskComposerContext") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerContext) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_CONTEXT_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_data_storage.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_data_storage.h index 4f71214351..54b84ea756 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_data_storage.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_data_storage.h @@ -127,7 +127,5 @@ class TaskComposerDataStorage }; } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerDataStorage, "TaskComposerDataStorage") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerDataStorage) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_DATA_STORAGE_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_executor.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_executor.h index d611a5af36..b28bc53e8e 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_executor.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_executor.h @@ -98,6 +98,6 @@ class TaskComposerExecutor }; } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerExecutor, "TaskComposerExecutor") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerExecutor) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_EXECUTOR_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_graph.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_graph.h index f83a751939..6b59311a65 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_graph.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_graph.h @@ -150,6 +150,6 @@ class TaskComposerGraph : public TaskComposerNode } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerGraph, "TaskComposerGraph") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerGraph) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_GRAPH_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_keys.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_keys.h index 84452870eb..e24a9414e9 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_keys.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_keys.h @@ -99,7 +99,5 @@ class TaskComposerKeys std::ostream& operator<<(std::ostream& os, const TaskComposerKeys& keys); } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerKeys, "TaskComposerKeys") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerKeys) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_KEYS_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node.h index 0b9053ca44..5d714f1983 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node.h @@ -234,7 +234,5 @@ class TaskComposerNode }; } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerNode, "TaskComposerNode") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerNode) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_NODE_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_info.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_info.h index 320c612725..a7d9c2f0f0 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_info.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_info.h @@ -227,8 +227,6 @@ class TaskComposerNodeInfoContainer const boost::uuids::uuid& uuid) const; }; } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerNodeInfo, "TaskComposerNodeInfo") -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerNodeInfoContainer, "TaskComposerNodeInfoContainer") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerNodeInfo) +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerNodeInfoContainer) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_NODE_INFO_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_ports.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_ports.h index 4890a4eb01..c6254eb636 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_ports.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node_ports.h @@ -66,7 +66,5 @@ struct TaskComposerNodePorts }; } // namespace tesseract_planning - -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerNodePorts, "TaskComposerNodePorts") - +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerNodePorts) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_NODE_PORTS_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_pipeline.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_pipeline.h index cff502c866..396c7407a2 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_pipeline.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_pipeline.h @@ -87,6 +87,6 @@ class TaskComposerPipeline : public TaskComposerGraph } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerPipeline, "TaskComposerPipeline") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerPipeline) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_PIPELINE_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_task.h index 5ab3810905..0ea1c7316d 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_task.h @@ -86,6 +86,6 @@ class TaskComposerTask : public TaskComposerNode } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskComposerTask, "TaskComposerTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskComposerTask) #endif // TESSERACT_TASK_COMPOSER_TASK_COMPOSER_TASK_H diff --git a/tesseract_task_composer/core/include/tesseract_task_composer/core/test_suite/test_task.h b/tesseract_task_composer/core/include/tesseract_task_composer/core/test_suite/test_task.h index 8c076243ba..a6bfaea693 100644 --- a/tesseract_task_composer/core/include/tesseract_task_composer/core/test_suite/test_task.h +++ b/tesseract_task_composer/core/include/tesseract_task_composer/core/test_suite/test_task.h @@ -74,6 +74,6 @@ class TestTask : public TaskComposerTask }; } // namespace tesseract_planning::test_suite -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::test_suite::TestTask, "TestTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::test_suite::TestTask) #endif // TESSERACT_TASK_COMPOSER_TEST_TASK_H diff --git a/tesseract_task_composer/core/src/nodes/done_task.cpp b/tesseract_task_composer/core/src/nodes/done_task.cpp index ffceb8a426..d0f57449a5 100644 --- a/tesseract_task_composer/core/src/nodes/done_task.cpp +++ b/tesseract_task_composer/core/src/nodes/done_task.cpp @@ -69,5 +69,5 @@ void DoneTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DoneTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DoneTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DoneTask) diff --git a/tesseract_task_composer/core/src/nodes/error_task.cpp b/tesseract_task_composer/core/src/nodes/error_task.cpp index 3f60bb267b..7bca15d2f3 100644 --- a/tesseract_task_composer/core/src/nodes/error_task.cpp +++ b/tesseract_task_composer/core/src/nodes/error_task.cpp @@ -69,5 +69,5 @@ void ErrorTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ErrorTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ErrorTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ErrorTask) diff --git a/tesseract_task_composer/core/src/nodes/remap_task.cpp b/tesseract_task_composer/core/src/nodes/remap_task.cpp index baf1872107..9cda88d8c6 100644 --- a/tesseract_task_composer/core/src/nodes/remap_task.cpp +++ b/tesseract_task_composer/core/src/nodes/remap_task.cpp @@ -98,5 +98,5 @@ void RemapTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RemapTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::RemapTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RemapTask) diff --git a/tesseract_task_composer/core/src/nodes/start_task.cpp b/tesseract_task_composer/core/src/nodes/start_task.cpp index 610600f0b2..2e8dcae814 100644 --- a/tesseract_task_composer/core/src/nodes/start_task.cpp +++ b/tesseract_task_composer/core/src/nodes/start_task.cpp @@ -65,5 +65,5 @@ void StartTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StartTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::StartTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::StartTask) diff --git a/tesseract_task_composer/core/src/nodes/sync_task.cpp b/tesseract_task_composer/core/src/nodes/sync_task.cpp index 436462ff84..1e64da294a 100644 --- a/tesseract_task_composer/core/src/nodes/sync_task.cpp +++ b/tesseract_task_composer/core/src/nodes/sync_task.cpp @@ -65,5 +65,5 @@ void SyncTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SyncTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::SyncTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SyncTask) diff --git a/tesseract_task_composer/core/src/task_composer_context.cpp b/tesseract_task_composer/core/src/task_composer_context.cpp index 26f4ba7c51..dfe9ae59ef 100644 --- a/tesseract_task_composer/core/src/task_composer_context.cpp +++ b/tesseract_task_composer/core/src/task_composer_context.cpp @@ -91,6 +91,5 @@ void TaskComposerContext::serialize(Archive& ar, const unsigned int /*version*/) } } // namespace tesseract_planning - -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerContext) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerContext) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerContext) diff --git a/tesseract_task_composer/core/src/task_composer_data_storage.cpp b/tesseract_task_composer/core/src/task_composer_data_storage.cpp index e4c420f39c..b6b9d5640d 100644 --- a/tesseract_task_composer/core/src/task_composer_data_storage.cpp +++ b/tesseract_task_composer/core/src/task_composer_data_storage.cpp @@ -192,6 +192,5 @@ void TaskComposerDataStorage::serialize(Archive& ar, const unsigned int /*versio } } // namespace tesseract_planning - -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerDataStorage) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerDataStorage) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerDataStorage) diff --git a/tesseract_task_composer/core/src/task_composer_executor.cpp b/tesseract_task_composer/core/src/task_composer_executor.cpp index 3f31778498..332803a313 100644 --- a/tesseract_task_composer/core/src/task_composer_executor.cpp +++ b/tesseract_task_composer/core/src/task_composer_executor.cpp @@ -63,5 +63,5 @@ void TaskComposerExecutor::serialize(Archive& ar, const unsigned int /*version*/ } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerExecutor) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerExecutor) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerExecutor) diff --git a/tesseract_task_composer/core/src/task_composer_graph.cpp b/tesseract_task_composer/core/src/task_composer_graph.cpp index 3010a4c7d8..02ce58288a 100644 --- a/tesseract_task_composer/core/src/task_composer_graph.cpp +++ b/tesseract_task_composer/core/src/task_composer_graph.cpp @@ -472,5 +472,5 @@ void TaskComposerGraph::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerGraph) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerGraph) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerGraph) diff --git a/tesseract_task_composer/core/src/task_composer_keys.cpp b/tesseract_task_composer/core/src/task_composer_keys.cpp index 12d3726ace..ea243423cd 100644 --- a/tesseract_task_composer/core/src/task_composer_keys.cpp +++ b/tesseract_task_composer/core/src/task_composer_keys.cpp @@ -115,5 +115,5 @@ std::ostream& operator<<(std::ostream& os, const TaskComposerKeys& keys) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerKeys) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerKeys) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerKeys) diff --git a/tesseract_task_composer/core/src/task_composer_node.cpp b/tesseract_task_composer/core/src/task_composer_node.cpp index 7352f376bf..2673d80807 100644 --- a/tesseract_task_composer/core/src/task_composer_node.cpp +++ b/tesseract_task_composer/core/src/task_composer_node.cpp @@ -549,5 +549,5 @@ void TaskComposerNode::setData(TaskComposerDataStorage& data_storage, } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNode) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerNode) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNode) diff --git a/tesseract_task_composer/core/src/task_composer_node_info.cpp b/tesseract_task_composer/core/src/task_composer_node_info.cpp index 548e55684a..cebf1a1ab8 100644 --- a/tesseract_task_composer/core/src/task_composer_node_info.cpp +++ b/tesseract_task_composer/core/src/task_composer_node_info.cpp @@ -291,8 +291,8 @@ void TaskComposerNodeInfoContainer::serialize(Archive& ar, const unsigned int /* } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNodeInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerNodeInfo) +BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerNodeInfoContainer) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNodeInfo) TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNodeInfoContainer) -BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerNodeInfoContainer) diff --git a/tesseract_task_composer/core/src/task_composer_node_ports.cpp b/tesseract_task_composer/core/src/task_composer_node_ports.cpp index 7dfb72fc9a..7f09419d5e 100644 --- a/tesseract_task_composer/core/src/task_composer_node_ports.cpp +++ b/tesseract_task_composer/core/src/task_composer_node_ports.cpp @@ -153,6 +153,5 @@ void TaskComposerNodePorts::serialize(Archive& ar, const unsigned int /*version* } } // namespace tesseract_planning - -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNodePorts) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerNodePorts) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerNodePorts) diff --git a/tesseract_task_composer/core/src/task_composer_pipeline.cpp b/tesseract_task_composer/core/src/task_composer_pipeline.cpp index 1a270c6a42..b60f5cd248 100644 --- a/tesseract_task_composer/core/src/task_composer_pipeline.cpp +++ b/tesseract_task_composer/core/src/task_composer_pipeline.cpp @@ -197,5 +197,5 @@ void TaskComposerPipeline::serialize(Archive& ar, const unsigned int /*version*/ } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerPipeline) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerPipeline) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerPipeline) diff --git a/tesseract_task_composer/core/src/task_composer_task.cpp b/tesseract_task_composer/core/src/task_composer_task.cpp index 80cf45fb5e..63156e4448 100644 --- a/tesseract_task_composer/core/src/task_composer_task.cpp +++ b/tesseract_task_composer/core/src/task_composer_task.cpp @@ -135,5 +135,5 @@ void TaskComposerTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskComposerTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskComposerTask) diff --git a/tesseract_task_composer/core/src/test_suite/test_task.cpp b/tesseract_task_composer/core/src/test_suite/test_task.cpp index 2548ed12b6..8f7add23a5 100644 --- a/tesseract_task_composer/core/src/test_suite/test_task.cpp +++ b/tesseract_task_composer/core/src/test_suite/test_task.cpp @@ -122,5 +122,5 @@ std::unique_ptr TestTask::runImpl(TaskComposerContext& con } // namespace tesseract_planning::test_suite -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::test_suite::TestTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::test_suite::TestTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::test_suite::TestTask) diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/continuous_contact_check_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/continuous_contact_check_task.h index 332222d224..3c81416ac9 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/continuous_contact_check_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/continuous_contact_check_task.h @@ -115,6 +115,6 @@ class ContinuousContactCheckTaskInfo : public TaskComposerNodeInfo }; } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::ContinuousContactCheckTask, "ContinuousContactCheckTask") -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::ContinuousContactCheckTaskInfo, "ContinuousContactCheckTaskInfo") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::ContinuousContactCheckTask) +BOOST_CLASS_EXPORT_KEY(tesseract_planning::ContinuousContactCheckTaskInfo) #endif // TESSERACT_TASK_COMPOSER_CONTINUOUS_CONTACT_CHECK_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/discrete_contact_check_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/discrete_contact_check_task.h index 25490f97e1..b43c129fde 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/discrete_contact_check_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/discrete_contact_check_task.h @@ -116,6 +116,6 @@ class DiscreteContactCheckTaskInfo : public TaskComposerNodeInfo } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::DiscreteContactCheckTask, "DiscreteContactCheckTask") -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::DiscreteContactCheckTaskInfo, "DiscreteContactCheckTaskInfo") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::DiscreteContactCheckTask) +BOOST_CLASS_EXPORT_KEY(tesseract_planning::DiscreteContactCheckTaskInfo) #endif // TESSERACT_TASK_COMPOSER_DISCRETE_CONTACT_CHECK_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_bounds_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_bounds_task.h index bbdf2ef839..8b92e0583d 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_bounds_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_bounds_task.h @@ -92,5 +92,5 @@ class FixStateBoundsTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::FixStateBoundsTask, "FixStateBoundsTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::FixStateBoundsTask) #endif // TESSERACT_TASK_COMPOSER_FIX_STATE_BOUNDS_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_collision_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_collision_task.h index 2462141b38..3cb2ff1717 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_collision_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/fix_state_collision_task.h @@ -178,6 +178,6 @@ bool applyCorrectionWorkflow(WaypointPoly& waypoint, tesseract_collision::ContactResultMap& contacts); } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::FixStateCollisionTask, "FixStateCollisionTask") -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::FixStateCollisionTaskInfo, "FixStateCollisionTaskInfo") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::FixStateCollisionTask) +BOOST_CLASS_EXPORT_KEY(tesseract_planning::FixStateCollisionTaskInfo) #endif // TESSERACT_TASK_COMPOSER_FIX_STATE_COLLISION_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_input_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_input_task.h index c66cee0487..0968dc8101 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_input_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_input_task.h @@ -96,5 +96,5 @@ class FormatAsInputTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::FormatAsInputTask, "FormatAsInputTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::FormatAsInputTask) #endif // TESSERACT_TASK_COMPOSER_FORMAT_AS_INPUT_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_result_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_result_task.h index d1ecf334fe..fd832658ab 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_result_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/format_as_result_task.h @@ -50,6 +50,6 @@ class FormatAsResultTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::FormatAsResultTask, "FormatAsResultTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::FormatAsResultTask) #endif // TESSERACT_TASK_COMPOSER_FORMAT_AS_RESULT_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/iterative_spline_parameterization_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/iterative_spline_parameterization_task.h index e32a49aa4e..4778d0537c 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/iterative_spline_parameterization_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/iterative_spline_parameterization_task.h @@ -94,5 +94,5 @@ class IterativeSplineParameterizationTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::IterativeSplineParameterizationTask, "IterativeSplineParameterizationTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::IterativeSplineParameterizationTask) #endif // TESSERACT_TASK_COMPOSER_ITERATIVE_SPLINE_PARAMETERIZATION_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/min_length_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/min_length_task.h index 2bb98bc09e..ead8d1b32e 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/min_length_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/min_length_task.h @@ -85,5 +85,5 @@ class MinLengthTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::MinLengthTask, "MinLengthTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::MinLengthTask) #endif // TESSERACT_TASK_COMPOSER_MIN_LENGTH_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/motion_planner_task_info.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/motion_planner_task_info.h index 3d10994526..f958a4b1ea 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/motion_planner_task_info.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/motion_planner_task_info.h @@ -65,5 +65,5 @@ class MotionPlannerTaskInfo : public TaskComposerNodeInfo } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::MotionPlannerTaskInfo, "MotionPlannerTaskInfo") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::MotionPlannerTaskInfo) #endif // TESSERACT_TASK_COMPOSER_MOTION_PLANNER_TASK_INFO_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/process_planning_input_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/process_planning_input_task.h index 53525979a6..a4b894a544 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/process_planning_input_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/process_planning_input_task.h @@ -82,6 +82,6 @@ class ProcessPlanningInputTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::ProcessPlanningInputTask, "ProcessPlanningInputTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::ProcessPlanningInputTask) #endif // TESSERACT_TASK_COMPOSER_PROCESS_PLANNING_INPUT_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/profile_switch_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/profile_switch_task.h index 505a30962b..40831d9904 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/profile_switch_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/profile_switch_task.h @@ -85,5 +85,5 @@ class ProfileSwitchTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::ProfileSwitchTask, "ProfileSwitchTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::ProfileSwitchTask) #endif // TESSERACT_TASK_COMPOSER_PROFILE_SWITCH_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_motion_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_motion_task.h index f66347feb0..37864a28d1 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_motion_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_motion_task.h @@ -117,6 +117,6 @@ class RasterMotionTask : public TaskComposerTask }; } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::RasterMotionTask, "RasterMotionTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::RasterMotionTask) #endif // TESSERACT_TASK_COMPOSER_RASTER_MOTION_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_only_motion_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_only_motion_task.h index 1d08092ee2..58b753eefe 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_only_motion_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/raster_only_motion_task.h @@ -112,6 +112,6 @@ class RasterOnlyMotionTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::RasterOnlyMotionTask, "RasterOnlyMotionTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::RasterOnlyMotionTask) #endif // TESSERACT_TASK_COMPOSER_RASTER_ONLY_MOTION_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/ruckig_trajectory_smoothing_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/ruckig_trajectory_smoothing_task.h index d194b0e173..3e0a18b43a 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/ruckig_trajectory_smoothing_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/ruckig_trajectory_smoothing_task.h @@ -86,6 +86,6 @@ class RuckigTrajectorySmoothingTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::RuckigTrajectorySmoothingTask, "RuckigTrajectorySmoothingTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::RuckigTrajectorySmoothingTask) #endif // TESSERACT_TASK_COMPOSER_RUCKIG_TRAJECTORY_SMOOTHING_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/time_optimal_parameterization_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/time_optimal_parameterization_task.h index 55600e268c..684e1ee926 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/time_optimal_parameterization_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/time_optimal_parameterization_task.h @@ -114,6 +114,6 @@ class TimeOptimalParameterizationTaskInfo : public TaskComposerNodeInfo }; } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TimeOptimalParameterizationTask, "TimeOptimalParameterizationTask") -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TimeOptimalParameterizationTaskInfo, "TimeOptimalParameterizationTaskInfo") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TimeOptimalParameterizationTask) +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TimeOptimalParameterizationTaskInfo) #endif // TESSERACT_TASK_COMPOSER_TIME_OPTIMAL_TRAJECTORY_GENERATION_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_end_state_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_end_state_task.h index ed3bc719ba..6397b662b5 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_end_state_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_end_state_task.h @@ -77,6 +77,6 @@ class UpdateEndStateTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::UpdateEndStateTask, "UpdateEndStateTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::UpdateEndStateTask) #endif // TESSERACT_TASK_COMPOSER_UPDATE_END_STATE_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_and_end_state_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_and_end_state_task.h index e582e048c8..d1e8595d11 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_and_end_state_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_and_end_state_task.h @@ -82,6 +82,6 @@ class UpdateStartAndEndStateTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::UpdateStartAndEndStateTask, "UpdateStartAndEndStateTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::UpdateStartAndEndStateTask) #endif // TESSERACT_TASK_COMPOSER_UPDATE_START_AND_END_STATE_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_state_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_state_task.h index 314c200cdb..517e67e5dc 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_state_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/update_start_state_task.h @@ -76,6 +76,6 @@ class UpdateStartStateTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::UpdateStartStateTask, "UpdateStartStateTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::UpdateStartStateTask) #endif // TESSERACT_TASK_COMPOSER_UPDATE_START_STATE_TASK_H diff --git a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/upsample_trajectory_task.h b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/upsample_trajectory_task.h index d5e2981738..7b5274460b 100644 --- a/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/upsample_trajectory_task.h +++ b/tesseract_task_composer/planning/include/tesseract_task_composer/planning/nodes/upsample_trajectory_task.h @@ -95,5 +95,5 @@ class UpsampleTrajectoryTask : public TaskComposerTask } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::UpsampleTrajectoryTask, "UpsampleTrajectoryTask") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::UpsampleTrajectoryTask) #endif // TESSERACT_TASK_COMPOSER_UPSAMPLE_TRAJECTORY_TASK_H diff --git a/tesseract_task_composer/planning/src/nodes/continuous_contact_check_task.cpp b/tesseract_task_composer/planning/src/nodes/continuous_contact_check_task.cpp index ffc60e071e..0aaadfa433 100644 --- a/tesseract_task_composer/planning/src/nodes/continuous_contact_check_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/continuous_contact_check_task.cpp @@ -228,7 +228,7 @@ void ContinuousContactCheckTaskInfo::serialize(Archive& ar, const unsigned int / } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ContinuousContactCheckTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ContinuousContactCheckTask) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ContinuousContactCheckTaskInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ContinuousContactCheckTaskInfo) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ContinuousContactCheckTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ContinuousContactCheckTaskInfo) diff --git a/tesseract_task_composer/planning/src/nodes/discrete_contact_check_task.cpp b/tesseract_task_composer/planning/src/nodes/discrete_contact_check_task.cpp index 2f46ac773e..d7c4f1df51 100644 --- a/tesseract_task_composer/planning/src/nodes/discrete_contact_check_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/discrete_contact_check_task.cpp @@ -223,7 +223,7 @@ void DiscreteContactCheckTaskInfo::serialize(Archive& ar, const unsigned int /*v } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DiscreteContactCheckTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DiscreteContactCheckTask) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DiscreteContactCheckTaskInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::DiscreteContactCheckTaskInfo) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DiscreteContactCheckTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::DiscreteContactCheckTaskInfo) diff --git a/tesseract_task_composer/planning/src/nodes/fix_state_bounds_task.cpp b/tesseract_task_composer/planning/src/nodes/fix_state_bounds_task.cpp index 3202ee2cef..8061666ce7 100644 --- a/tesseract_task_composer/planning/src/nodes/fix_state_bounds_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/fix_state_bounds_task.cpp @@ -286,5 +286,5 @@ void FixStateBoundsTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateBoundsTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::FixStateBoundsTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateBoundsTask) diff --git a/tesseract_task_composer/planning/src/nodes/fix_state_collision_task.cpp b/tesseract_task_composer/planning/src/nodes/fix_state_collision_task.cpp index 11dddef1e8..ad1d23c8af 100644 --- a/tesseract_task_composer/planning/src/nodes/fix_state_collision_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/fix_state_collision_task.cpp @@ -788,7 +788,7 @@ void FixStateCollisionTaskInfo::serialize(Archive& ar, const unsigned int /*vers } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateCollisionTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::FixStateCollisionTask) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateCollisionTaskInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::FixStateCollisionTaskInfo) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateCollisionTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FixStateCollisionTaskInfo) diff --git a/tesseract_task_composer/planning/src/nodes/format_as_input_task.cpp b/tesseract_task_composer/planning/src/nodes/format_as_input_task.cpp index 97fb51e608..73ac2197d1 100644 --- a/tesseract_task_composer/planning/src/nodes/format_as_input_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/format_as_input_task.cpp @@ -179,5 +179,5 @@ void FormatAsInputTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FormatAsInputTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::FormatAsInputTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::FormatAsInputTask) diff --git a/tesseract_task_composer/planning/src/nodes/iterative_spline_parameterization_task.cpp b/tesseract_task_composer/planning/src/nodes/iterative_spline_parameterization_task.cpp index 936d983e21..a46d4f97dc 100644 --- a/tesseract_task_composer/planning/src/nodes/iterative_spline_parameterization_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/iterative_spline_parameterization_task.cpp @@ -262,5 +262,5 @@ void IterativeSplineParameterizationTask::serialize(Archive& ar, const unsigned } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::IterativeSplineParameterizationTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::IterativeSplineParameterizationTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::IterativeSplineParameterizationTask) diff --git a/tesseract_task_composer/planning/src/nodes/min_length_task.cpp b/tesseract_task_composer/planning/src/nodes/min_length_task.cpp index 5fe9706963..81d6870c50 100644 --- a/tesseract_task_composer/planning/src/nodes/min_length_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/min_length_task.cpp @@ -201,5 +201,5 @@ void MinLengthTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MinLengthTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::MinLengthTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MinLengthTask) diff --git a/tesseract_task_composer/planning/src/nodes/motion_planner_task_info.cpp b/tesseract_task_composer/planning/src/nodes/motion_planner_task_info.cpp index 5a689477a0..8053e683e5 100644 --- a/tesseract_task_composer/planning/src/nodes/motion_planner_task_info.cpp +++ b/tesseract_task_composer/planning/src/nodes/motion_planner_task_info.cpp @@ -67,5 +67,5 @@ void MotionPlannerTaskInfo::serialize(Archive& ar, const unsigned int /*version* } } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MotionPlannerTaskInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::MotionPlannerTaskInfo) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MotionPlannerTaskInfo) diff --git a/tesseract_task_composer/planning/src/nodes/process_planning_input_task.cpp b/tesseract_task_composer/planning/src/nodes/process_planning_input_task.cpp index 746d6f68b0..7c9027e148 100644 --- a/tesseract_task_composer/planning/src/nodes/process_planning_input_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/process_planning_input_task.cpp @@ -116,5 +116,5 @@ void ProcessPlanningInputTask::serialize(Archive& ar, const unsigned int /*versi } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProcessPlanningInputTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ProcessPlanningInputTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProcessPlanningInputTask) diff --git a/tesseract_task_composer/planning/src/nodes/profile_switch_task.cpp b/tesseract_task_composer/planning/src/nodes/profile_switch_task.cpp index a74dac807d..c1c004834c 100644 --- a/tesseract_task_composer/planning/src/nodes/profile_switch_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/profile_switch_task.cpp @@ -128,5 +128,5 @@ void ProfileSwitchTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileSwitchTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ProfileSwitchTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileSwitchTask) diff --git a/tesseract_task_composer/planning/src/nodes/raster_motion_task.cpp b/tesseract_task_composer/planning/src/nodes/raster_motion_task.cpp index fe153251c5..e7df534326 100644 --- a/tesseract_task_composer/planning/src/nodes/raster_motion_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/raster_motion_task.cpp @@ -612,5 +612,5 @@ void RasterMotionTask::checkTaskInput(const tesseract_common::AnyPoly& input) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RasterMotionTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::RasterMotionTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RasterMotionTask) diff --git a/tesseract_task_composer/planning/src/nodes/raster_only_motion_task.cpp b/tesseract_task_composer/planning/src/nodes/raster_only_motion_task.cpp index 0bbda24d5f..e782a868bc 100644 --- a/tesseract_task_composer/planning/src/nodes/raster_only_motion_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/raster_only_motion_task.cpp @@ -500,5 +500,5 @@ void RasterOnlyMotionTask::checkTaskInput(const tesseract_common::AnyPoly& input } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RasterOnlyMotionTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::RasterOnlyMotionTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RasterOnlyMotionTask) diff --git a/tesseract_task_composer/planning/src/nodes/ruckig_trajectory_smoothing_task.cpp b/tesseract_task_composer/planning/src/nodes/ruckig_trajectory_smoothing_task.cpp index 19f118ef91..c8195d4760 100644 --- a/tesseract_task_composer/planning/src/nodes/ruckig_trajectory_smoothing_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/ruckig_trajectory_smoothing_task.cpp @@ -248,5 +248,5 @@ void RuckigTrajectorySmoothingTask::serialize(Archive& ar, const unsigned int /* } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RuckigTrajectorySmoothingTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::RuckigTrajectorySmoothingTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::RuckigTrajectorySmoothingTask) diff --git a/tesseract_task_composer/planning/src/nodes/time_optimal_parameterization_task.cpp b/tesseract_task_composer/planning/src/nodes/time_optimal_parameterization_task.cpp index f5e2e277d9..568bbfda04 100644 --- a/tesseract_task_composer/planning/src/nodes/time_optimal_parameterization_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/time_optimal_parameterization_task.cpp @@ -263,7 +263,7 @@ void TimeOptimalParameterizationTaskInfo::serialize(Archive& ar, const unsigned } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimeOptimalParameterizationTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TimeOptimalParameterizationTask) -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimeOptimalParameterizationTaskInfo) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TimeOptimalParameterizationTaskInfo) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimeOptimalParameterizationTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TimeOptimalParameterizationTaskInfo) diff --git a/tesseract_task_composer/planning/src/nodes/update_end_state_task.cpp b/tesseract_task_composer/planning/src/nodes/update_end_state_task.cpp index a1608c5dff..b0860173ef 100644 --- a/tesseract_task_composer/planning/src/nodes/update_end_state_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/update_end_state_task.cpp @@ -150,5 +150,5 @@ void UpdateEndStateTask::serialize(Archive& ar, const unsigned int /*version*/) } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateEndStateTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::UpdateEndStateTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateEndStateTask) diff --git a/tesseract_task_composer/planning/src/nodes/update_start_and_end_state_task.cpp b/tesseract_task_composer/planning/src/nodes/update_start_and_end_state_task.cpp index f34a613cd2..f6a98dfb46 100644 --- a/tesseract_task_composer/planning/src/nodes/update_start_and_end_state_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/update_start_and_end_state_task.cpp @@ -181,5 +181,5 @@ void UpdateStartAndEndStateTask::serialize(Archive& ar, const unsigned int /*ver } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateStartAndEndStateTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::UpdateStartAndEndStateTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateStartAndEndStateTask) diff --git a/tesseract_task_composer/planning/src/nodes/update_start_state_task.cpp b/tesseract_task_composer/planning/src/nodes/update_start_state_task.cpp index 0c40487c00..4ac75bc596 100644 --- a/tesseract_task_composer/planning/src/nodes/update_start_state_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/update_start_state_task.cpp @@ -153,5 +153,5 @@ void UpdateStartStateTask::serialize(Archive& ar, const unsigned int /*version*/ } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateStartStateTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::UpdateStartStateTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpdateStartStateTask) diff --git a/tesseract_task_composer/planning/src/nodes/upsample_trajectory_task.cpp b/tesseract_task_composer/planning/src/nodes/upsample_trajectory_task.cpp index 927cfd6abc..805b563783 100644 --- a/tesseract_task_composer/planning/src/nodes/upsample_trajectory_task.cpp +++ b/tesseract_task_composer/planning/src/nodes/upsample_trajectory_task.cpp @@ -210,5 +210,5 @@ void UpsampleTrajectoryTask::serialize(Archive& ar, const unsigned int /*version } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpsampleTrajectoryTask) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::UpsampleTrajectoryTask) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::UpsampleTrajectoryTask) diff --git a/tesseract_task_composer/taskflow/include/tesseract_task_composer/taskflow/taskflow_task_composer_executor.h b/tesseract_task_composer/taskflow/include/tesseract_task_composer/taskflow/taskflow_task_composer_executor.h index d2c5f0c7eb..422248dc75 100644 --- a/tesseract_task_composer/taskflow/include/tesseract_task_composer/taskflow/taskflow_task_composer_executor.h +++ b/tesseract_task_composer/taskflow/include/tesseract_task_composer/taskflow/taskflow_task_composer_executor.h @@ -110,6 +110,6 @@ class TaskflowTaskComposerExecutor : public TaskComposerExecutor }; } // namespace tesseract_planning -BOOST_CLASS_EXPORT_KEY2(tesseract_planning::TaskflowTaskComposerExecutor, "TaskflowExecutor") +BOOST_CLASS_EXPORT_KEY(tesseract_planning::TaskflowTaskComposerExecutor) #endif // TESSERACT_TASK_COMPOSER_TASKFLOW_TASK_COMPOSER_EXECUTOR_H diff --git a/tesseract_task_composer/taskflow/src/taskflow_task_composer_executor.cpp b/tesseract_task_composer/taskflow/src/taskflow_task_composer_executor.cpp index 65a39506da..64314f9594 100644 --- a/tesseract_task_composer/taskflow/src/taskflow_task_composer_executor.cpp +++ b/tesseract_task_composer/taskflow/src/taskflow_task_composer_executor.cpp @@ -251,5 +251,5 @@ void TaskflowTaskComposerExecutor::serialize(Archive& ar, const unsigned int ver } // namespace tesseract_planning -TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskflowTaskComposerExecutor) BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::TaskflowTaskComposerExecutor) +TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::TaskflowTaskComposerExecutor)