Cleanup boost serialiation

tesseract-robotics · Jul 28, 2024 · ca0da55 · ca0da55
1 parent 98ca57b
commit ca0da55
Show file tree

Hide file tree

Showing 82 changed files with 111 additions and 123 deletions.
diff --git 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_common/serialization.h>
+
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CartesianWaypoint)
-TESSERACT_CARTESIAN_WAYPOINT_EXPORT_IMPLEMENT(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
@@ -535,6 +535,7 @@ void CompositeInstruction::serialize(Archive& ar, const unsigned int /*version*/
 }  // namespace tesseract_planning
 
 #include <tesseract_common/serialization.h>
+
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CompositeInstruction)
 TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::CompositeInstruction)
 TESSERACT_ANY_EXPORT_IMPLEMENT(TesseractPlanningCompositeInstruction)
diff --git 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_common/serialization.h>
+
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::MoveInstruction)
 TESSERACT_MOVE_INSTRUCTION_EXPORT_IMPLEMENT(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
@@ -129,12 +129,12 @@ void tesseract_planning::CartesianWaypointPoly::serialize(Archive& ar, const uns
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<CartesianWaypointPolyBase>(*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
@@ -61,10 +61,10 @@ void tesseract_planning::InstructionPoly::serialize(Archive& ar, const unsigned
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<InstructionPolyBase>(*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
@@ -122,12 +122,12 @@ void tesseract_planning::JointWaypointPoly::serialize(Archive& ar, const unsigne
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<JointWaypointPolyBase>(*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
@@ -171,12 +171,12 @@ void tesseract_planning::MoveInstructionPoly::serialize(Archive& ar, const unsig
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<MoveInstructionPolyBase>(*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
@@ -101,12 +101,12 @@ void tesseract_planning::StateWaypointPoly::serialize(Archive& ar, const unsigne
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<StateWaypointPolyBase>(*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
@@ -43,10 +43,10 @@ void tesseract_planning::WaypointPoly::serialize(Archive& ar, const unsigned int
   ar& boost::serialization::make_nvp("base", boost::serialization::base_object<WaypointPolyBase>(*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/set_analog_instruction.cpp b/tesseract_command_language/src/set_analog_instruction.cpp
@@ -102,4 +102,4 @@ void SetAnalogInstruction::serialize(Archive& ar, const unsigned int /*version*/
 
 #include <tesseract_common/serialization.h>
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::SetAnalogInstruction)
-TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::SetAnalogInstruction);
+TESSERACT_INSTRUCTION_EXPORT_IMPLEMENT(tesseract_planning::SetAnalogInstruction)
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
@@ -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
@@ -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/...sk_composer/core/include/tesseract_task_composer/core/nodes/has_data_storage_entry_task.h b/...sk_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
@@ -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
@@ -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
@@ -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
@@ -129,7 +129,5 @@ class TaskComposerContext
   mutable std::atomic<bool> 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/...ract_task_composer/core/include/tesseract_task_composer/core/task_composer_data_storage.h b/...ract_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -122,5 +122,5 @@ std::unique_ptr<TaskComposerNodeInfo> 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/...r/planning/include/tesseract_task_composer/planning/nodes/continuous_contact_check_task.h b/...r/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