Re-enabled intrusive_ptr

This commit is contained in:
Twan van Laarhoven
2020-05-07 22:25:02 +02:00
parent 360f8d71ad
commit 8b25815f72
7 changed files with 99 additions and 49 deletions
+1 -1
View File
@@ -252,7 +252,7 @@ void CurveDragAction::move(const Vector2D& delta, double t) {
ControlPointAddAction::ControlPointAddAction(const SymbolShapeP& shape, UInt insert_after, double t)
: shape(shape)
, new_point(make_shared<ControlPoint>())
, new_point(make_intrusive<ControlPoint>())
, insert_after(insert_after)
, point1(shape->getPoint(insert_after))
, point2(shape->getPoint(insert_after + 1))
+1 -1
View File
@@ -25,7 +25,7 @@ DECLARE_POINTER_TYPE(StyleSheet);
// ----------------------------------------------------------------------------- : Card
/// A card from a card Set
class Card : public IntrusivePtrVirtualBase {
class Card : public IntrusivePtrVirtualBase, public IntrusiveFromThis<Card> {
public:
/// Default constructor, uses game_for_new_cards to make the game
Card();