amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix intrusive_ptr and IntrusiveFromThis on gcc, fixes #21

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-08 22:29:30 +02:00
parent 2d171732a0
commit 8f6423a96e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/smart_ptr.hpp
+3 -3
View File
@@ -47,8 +47,8 @@ protected:
} }
private: private:
mutable std::atomic<unsigned int> ref_count = 0; mutable std::atomic<unsigned int> ref_count = 0;
template <typename T> friend void intrusive_ptr_add_ref(const IntrusivePtrBase<T>* ptr); template <typename U> friend void intrusive_ptr_add_ref(const IntrusivePtrBase<U>* ptr);
template <typename T> friend void intrusive_ptr_release(const IntrusivePtrBase<T>* ptr); template <typename U> friend void intrusive_ptr_release(const IntrusivePtrBase<U>* ptr);
}; };
template <typename T> void intrusive_ptr_add_ref(const IntrusivePtrBase<T>* ptr) { template <typename T> void intrusive_ptr_add_ref(const IntrusivePtrBase<T>* ptr) {
@@ -87,7 +87,7 @@ template <typename T>
class IntrusiveFromThis : public std::enable_shared_from_this<T> { class IntrusiveFromThis : public std::enable_shared_from_this<T> {
public: public:
inline intrusive_ptr<T> intrusive_from_this() { inline intrusive_ptr<T> intrusive_from_this() {
return shared_from_this(); return this->shared_from_this();
} }
}; };