Commit 787d16f1 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'propertyptr-interface' into 'master'

PropertyPtr: clarify public interface by only exposing the necessary shared_ptr methods (cf #10)

See merge request !50
parents 56777c36 047ad081
Pipeline #8743 canceled with stage
in 2 minutes and 42 seconds
......@@ -63,7 +63,7 @@ class ResourceManager;
template <class PropT, class HandleT>
class PropertyPtr : public ptr::shared_ptr<PropT>, public BaseProperty {
class PropertyPtr : protected ptr::shared_ptr<PropT>, public BaseProperty {
friend class ResourceManager;
......@@ -82,6 +82,10 @@ public:
/// Destructor
virtual ~PropertyPtr();
using ptr::shared_ptr<PropT>::operator*;
using ptr::shared_ptr<PropT>::operator->;
using ptr::shared_ptr<PropT>::operator bool;
virtual const std::string& name() const;
virtual void delete_element(size_t _idx);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment