Skip to content

Commit 033d653

Browse files
Update because of changes with AnyPoly
1 parent 8a36efa commit 033d653

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

tesseract_command_language/include/tesseract_command_language/composite_instruction.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,13 @@ class CompositeInstruction : public InstructionInterface
509509
void serialize(Archive& ar, const unsigned int version); // NOLINT
510510
};
511511

512+
using CompositeInstructionAnyPoly = tesseract_common::AnyWrapper<CompositeInstruction>;
512513
} // namespace tesseract_planning
513514

514515
BOOST_CLASS_EXPORT_KEY(tesseract_planning::CompositeInstruction)
515516
BOOST_CLASS_TRACKING(tesseract_planning::CompositeInstruction, boost::serialization::track_never)
516517

517-
TESSERACT_ANY_EXPORT_KEY(tesseract_planning::CompositeInstruction, TesseractPlanningCompositeInstruction)
518+
BOOST_CLASS_EXPORT_KEY(tesseract_planning::CompositeInstructionAnyPoly)
519+
BOOST_CLASS_TRACKING(tesseract_planning::CompositeInstructionAnyPoly, boost::serialization::track_never)
518520

519521
#endif // TESSERACT_COMMAND_LANGUAGE_COMPOSITE_INSTRUCTION_H

tesseract_command_language/include/tesseract_command_language/profile_dictionary.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@ class ProfileDictionary
124124
void serialize(Archive& ar, const unsigned int version); // NOLINT
125125
};
126126

127+
using ProfileDictionaryPtrAnyPoly =
128+
tesseract_common::AnyWrapper<std::shared_ptr<tesseract_planning::ProfileDictionary>>;
127129
} // namespace tesseract_planning
128130

129131
BOOST_CLASS_EXPORT_KEY(tesseract_planning::ProfileDictionary)
130-
TESSERACT_ANY_EXPORT_KEY(std::shared_ptr<tesseract_planning::ProfileDictionary>,
131-
TesseractPlanningProfileDictionarySharedPtr)
132+
BOOST_CLASS_EXPORT_KEY(tesseract_planning::ProfileDictionaryPtrAnyPoly)
132133

133134
#endif // TESSERACT_MOTION_PLANNERS_PROFILE_DICTIONARY_H

tesseract_command_language/src/composite_instruction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,4 +560,5 @@ void CompositeInstruction::serialize(Archive& ar, const unsigned int /*version*/
560560
TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CompositeInstruction)
561561
BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::CompositeInstruction)
562562

563-
TESSERACT_ANY_EXPORT_IMPLEMENT(TesseractPlanningCompositeInstruction)
563+
TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::CompositeInstructionAnyPoly)
564+
BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::CompositeInstructionAnyPoly)

tesseract_command_language/src/profile_dictionary.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,6 @@ void ProfileDictionary::serialize(Archive& ar, const unsigned int /*version*/)
217217
#include <tesseract_common/serialization.h>
218218
TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileDictionary)
219219
BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ProfileDictionary)
220-
TESSERACT_ANY_EXPORT_IMPLEMENT(TesseractPlanningProfileDictionarySharedPtr)
220+
221+
TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_planning::ProfileDictionaryPtrAnyPoly)
222+
BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_planning::ProfileDictionaryPtrAnyPoly)

tesseract_task_composer/test/tesseract_task_composer_core_unit.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
3131

3232
#include <tesseract_common/resource_locator.h>
3333

34-
TESSERACT_ANY_EXPORT(tesseract_common::JointState, TesseractCommonJointState)
35-
3634
using namespace tesseract_planning;
3735

3836
TEST(TesseractTaskComposerCoreUnit, TaskComposerDataStorageTests) // NOLINT

0 commit comments

Comments
 (0)