Skip to content

Commit ca28dff

Browse files
Make sure serialized objects have friend struct tesseract_common::Serialization
1 parent 37bd639 commit ca28dff

File tree

101 files changed

+946
-899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+946
-899
lines changed

tesseract_command_language/include/tesseract_command_language/cartesian_waypoint.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class CartesianWaypoint final : public CartesianWaypointInterface
7373

7474
std::unique_ptr<CartesianWaypointInterface> clone() const override final;
7575

76-
protected:
76+
private:
7777
/** @brief The name of the waypoint */
7878
std::string name_;
7979
/** @brief The Cartesian Waypoint */
@@ -97,6 +97,7 @@ class CartesianWaypoint final : public CartesianWaypointInterface
9797
bool equals(const CartesianWaypointInterface& other) const override final;
9898

9999
friend class boost::serialization::access;
100+
friend struct tesseract_common::Serialization;
100101
template <class Archive>
101102
void serialize(Archive& ar, const unsigned int version); // NOLINT
102103
};

tesseract_command_language/include/tesseract_command_language/composite_instruction.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ class CompositeInstruction : public InstructionInterface
500500
bool equals(const InstructionInterface& other) const override final;
501501

502502
friend class boost::serialization::access;
503+
friend struct tesseract_common::Serialization;
503504
template <class Archive>
504505
void serialize(Archive& ar, const unsigned int version); // NOLINT
505506
};

tesseract_command_language/include/tesseract_command_language/joint_waypoint.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class JointWaypoint final : public JointWaypointInterface
8484

8585
std::unique_ptr<JointWaypointInterface> clone() const override final;
8686

87-
protected:
87+
private:
8888
/** @brief The name of the waypoint */
8989
std::string name_;
9090
/** @brief The names of the joints */
@@ -101,6 +101,7 @@ class JointWaypoint final : public JointWaypointInterface
101101
bool equals(const JointWaypointInterface& other) const override final;
102102

103103
friend class boost::serialization::access;
104+
friend struct tesseract_common::Serialization;
104105
template <class Archive>
105106
void serialize(Archive& ar, const unsigned int version); // NOLINT
106107
};

tesseract_command_language/include/tesseract_command_language/move_instruction.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ class MoveInstruction final : public MoveInstructionInterface
268268
bool equals(const MoveInstructionInterface& other) const override final;
269269

270270
friend class boost::serialization::access;
271+
friend struct tesseract_common::Serialization;
271272
template <class Archive>
272273
void serialize(Archive& ar, const unsigned int version); // NOLINT
273274
};

tesseract_command_language/include/tesseract_command_language/poly/cartesian_waypoint_poly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class CartesianWaypointPoly final : public WaypointInterface
319319

320320
} // namespace tesseract_planning
321321

322-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::CartesianWaypointInterface)
322+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::CartesianWaypointInterface)
323323
BOOST_CLASS_TRACKING(tesseract_planning::CartesianWaypointInterface, boost::serialization::track_never)
324324

325325
BOOST_CLASS_EXPORT_KEY(tesseract_planning::CartesianWaypointPoly)

tesseract_command_language/include/tesseract_command_language/poly/instruction_poly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class InstructionPoly
249249

250250
} // namespace tesseract_planning
251251

252-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::InstructionInterface)
252+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::InstructionInterface)
253253
BOOST_CLASS_TRACKING(tesseract_planning::InstructionInterface, boost::serialization::track_never)
254254

255255
BOOST_CLASS_EXPORT_KEY(tesseract_planning::InstructionPoly)

tesseract_command_language/include/tesseract_command_language/poly/joint_waypoint_poly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ class JointWaypointPoly final : public WaypointInterface
324324

325325
} // namespace tesseract_planning
326326

327-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::JointWaypointInterface)
327+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::JointWaypointInterface)
328328
BOOST_CLASS_TRACKING(tesseract_planning::JointWaypointInterface, boost::serialization::track_never)
329329

330330
BOOST_CLASS_EXPORT_KEY(tesseract_planning::JointWaypointPoly)

tesseract_command_language/include/tesseract_command_language/poly/move_instruction_poly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ class MoveInstructionPoly final : public InstructionInterface
482482

483483
} // namespace tesseract_planning
484484

485-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::MoveInstructionInterface)
485+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::MoveInstructionInterface)
486486
BOOST_CLASS_TRACKING(tesseract_planning::MoveInstructionInterface, boost::serialization::track_never)
487487

488488
BOOST_CLASS_EXPORT_KEY(tesseract_planning::MoveInstructionPoly)

tesseract_command_language/include/tesseract_command_language/poly/state_waypoint_poly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class StateWaypointPoly final : public WaypointInterface
345345

346346
} // namespace tesseract_planning
347347

348-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::StateWaypointInterface)
348+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::StateWaypointInterface)
349349
BOOST_CLASS_TRACKING(tesseract_planning::StateWaypointInterface, boost::serialization::track_never)
350350

351351
BOOST_CLASS_EXPORT_KEY(tesseract_planning::StateWaypointPoly)

tesseract_command_language/include/tesseract_command_language/poly/waypoint_poly.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class WaypointInterface
9191

9292
private:
9393
friend class boost::serialization::access;
94+
friend struct tesseract_common::Serialization;
9495
template <class Archive>
9596
void serialize(Archive& ar, const unsigned int version); // NOLINT
9697
};
@@ -206,7 +207,7 @@ class WaypointPoly
206207

207208
} // namespace tesseract_planning
208209

209-
BOOST_CLASS_EXPORT_KEY(tesseract_planning::WaypointInterface)
210+
BOOST_SERIALIZATION_ASSUME_ABSTRACT(tesseract_planning::WaypointInterface)
210211
BOOST_CLASS_TRACKING(tesseract_planning::WaypointInterface, boost::serialization::track_never)
211212

212213
BOOST_CLASS_EXPORT_KEY(tesseract_planning::WaypointPoly)

0 commit comments

Comments
 (0)