Commit 998e6603 authored by T.J. Corona's avatar T.J. Corona Committed by Kitware Robot

Merge topic 'more-gcc-4.9-malarky'

51c45fd5 Publicly inherit from std::enable_shared_from_this
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !2256
parents f3556dbd 51c45fd5
......@@ -50,7 +50,8 @@ namespace attribute
/// Upon registration, attribute resources associated with the same resource
/// manager as the ItemDefinitionManager will be able to read, write and create
/// attributes that contain the newly registered custom items.
class SMTKCORE_EXPORT ItemDefinitionManager : std::enable_shared_from_this<ItemDefinitionManager>
class SMTKCORE_EXPORT ItemDefinitionManager
: public std::enable_shared_from_this<ItemDefinitionManager>
{
public:
smtkTypedefs(smtk::attribute::ItemDefinitionManager);
......
......@@ -50,7 +50,7 @@ namespace query
/// Upon registration, all appropriate resources associated with the same
/// resource manager as the smtk::resource::query::Manager will be able to
/// construct instances of the newly registered Query.
class SMTKCORE_EXPORT Manager : std::enable_shared_from_this<Manager>
class SMTKCORE_EXPORT Manager : public std::enable_shared_from_this<Manager>
{
public:
smtkTypedefs(smtk::resource::query::Manager);
......
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