Fix abstract class serialization

tesseract-robotics · Oct 11, 2024 · 7bb7aec · 7bb7aec
1 parent 4ef61aa
commit 7bb7aec
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -140,8 +140,10 @@ NOTE: Must be a clean build when generating a code coverage report. Also must bu
 This package leverages boost serialization. When adding new classes which may be inherited from and then serialized as the base type it is imported to add the following macros for the base type and all derived types.
 
 - Header
-  - `BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_common::JointLimits) // Only if abstract`
-  - `BOOST_CLASS_EXPORT_KEY(tesseract_common::JointLimits)`
+  - Abstract Class
+    - `BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_common::JointLimits)`
+  - Non-Abstract Class
+    - `BOOST_CLASS_EXPORT_KEY(tesseract_common::JointLimits)`
 - Cpp
   - `BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::JointLimits)`
 

diff --git a/tesseract_common/include/tesseract_common/resource_locator.h b/tesseract_common/include/tesseract_common/resource_locator.h
@@ -241,8 +241,8 @@ class BytesResource : public tesseract_common::Resource
 
 }  // namespace tesseract_common
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_common::ResourceLocator)
-BOOST_CLASS_EXPORT_KEY(tesseract_common::ResourceLocator)
-BOOST_CLASS_EXPORT_KEY(tesseract_common::Resource)
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_common::Resource)
+
 BOOST_CLASS_EXPORT_KEY(tesseract_common::GeneralResourceLocator)
 BOOST_CLASS_EXPORT_KEY(tesseract_common::SimpleLocatedResource)
 BOOST_CLASS_EXPORT_KEY(tesseract_common::BytesResource)

diff --git a/tesseract_common/src/resource_locator.cpp b/tesseract_common/src/resource_locator.cpp
@@ -334,8 +334,6 @@ void BytesResource::serialize(Archive& ar, const unsigned int /*version*/)
 }  // namespace tesseract_common
 
 #include <tesseract_common/serialization.h>
-BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::ResourceLocator)
-BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::Resource)
 BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::GeneralResourceLocator)
 BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::SimpleLocatedResource)
 BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_common::BytesResource)

diff --git a/tesseract_geometry/include/tesseract_geometry/geometry.h b/tesseract_geometry/include/tesseract_geometry/geometry.h
@@ -97,6 +97,5 @@ using GeometrysConst = std::vector<Geometry::ConstPtr>;
 }  // namespace tesseract_geometry
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_geometry::Geometry)
-BOOST_CLASS_EXPORT_KEY(tesseract_geometry::Geometry)
 
 #endif  // TESSERACT_GEOMETRY_GEOMETRY_H
diff --git a/tesseract_geometry/src/geometry.cpp b/tesseract_geometry/src/geometry.cpp
@@ -46,5 +46,4 @@ void Geometry::serialize(Archive& ar, const unsigned int /*version*/)
 }  // namespace tesseract_geometry
 
 #include <tesseract_common/serialization.h>
-BOOST_CLASS_EXPORT_IMPLEMENT(tesseract_geometry::Geometry)
 TESSERACT_SERIALIZE_ARCHIVES_INSTANTIATE(tesseract_geometry::Geometry)