Compare commits

...

3 Commits

2 changed files with 17 additions and 18 deletions

View File

@ -96,7 +96,7 @@ public:
} }
}; };
#define rcp_root() \ #define rcp_managed_root(classname) \
public: \ public: \
void rcp_inc() const \ void rcp_inc() const \
{ \ { \
@ -110,9 +110,11 @@ public:
} \ } \
} \ } \
private: \ private: \
mutable std::atomic<int> ref_count{0} mutable std::atomic<int> ref_count{0}; \
rcp_managed(classname)
#define rcp_managed(classname) \ #define rcp_managed(classname) \
public: \
rcp<classname> get_rcp() \ rcp<classname> get_rcp() \
{ \ { \
return rcp<classname>(this); \ return rcp<classname>(this); \
@ -121,4 +123,5 @@ public:
static rcp<classname> create(Args&&... args) \ static rcp<classname> create(Args&&... args) \
{ \ { \
return (new classname(std::forward<Args>(args)...))->get_rcp(); \ return (new classname(std::forward<Args>(args)...))->get_rcp(); \
} } \
private:

View File

@ -8,7 +8,7 @@ static int myderived_destruct;
class MyBase class MyBase
{ {
rcp_root(); rcp_managed_root(MyBase);
protected: protected:
MyBase(int x, int y) MyBase(int x, int y)
@ -20,13 +20,12 @@ protected:
{ {
mybase_destruct++; mybase_destruct++;
} }
public:
rcp_managed(MyBase);
}; };
class MyDerived : public MyBase class MyDerived : public MyBase
{ {
rcp_managed(MyDerived);
protected: protected:
MyDerived(double v) : MyBase(1, 2) MyDerived(double v) : MyBase(1, 2)
{ {
@ -37,9 +36,6 @@ protected:
{ {
myderived_destruct++; myderived_destruct++;
} }
public:
rcp_managed(MyDerived)
}; };
void t1() void t1()