Browse Source

Merge pull request #867 from fluidsonic/clang-9

fixed clang 9 compile errors in shared_object_ptr
Eduardo Bart 3 years ago
parent
commit
c9bc9e327d
No account linked to committer's email address
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      src/framework/stdext/shared_object.h

+ 1
- 1
src/framework/stdext/shared_object.h View File

@@ -73,7 +73,7 @@ public:
73 73
     }
74 74
     shared_object_ptr(shared_object_ptr const& rhs): px(rhs.px) { if(px != nullptr) add_ref(); }
75 75
     template<class U>
76
-    shared_object_ptr(shared_object_ptr<U> const& rhs, typename std::is_convertible<U,T>::type* = nullptr) : px(rhs.get()) { if(px != nullptr) add_ref(); }
76
+    shared_object_ptr(shared_object_ptr<U> const& rhs, typename std::enable_if<std::is_convertible<U*,T*>::value, U*>::type = nullptr) : px(rhs.get()) { if(px != nullptr) add_ref(); }
77 77
     ~shared_object_ptr() { if(px != nullptr) dec_ref(); }
78 78
 
79 79
     void reset() { shared_object_ptr().swap(*this); }

Loading…
Cancel
Save