diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-25 18:09:38 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-26 15:13:14 -0800 |
| commit | 167097936acbc77fe91bbf73ee59f447f8a10b9a (patch) | |
| tree | b1efda2081e5e0b8f2e77d8b17dcd0580dc5e533 /include | |
| parent | 41e90b4150ba8302c0c6f9bec0f53059483fea9e (diff) | |
| download | qtlocation-mapboxgl-167097936acbc77fe91bbf73ee59f447f8a10b9a.tar.gz | |
Store SourceInfo as direct member
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/style/style_source.hpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/mbgl/style/style_source.hpp b/include/mbgl/style/style_source.hpp index 86473079cf..8c7d028880 100644 --- a/include/mbgl/style/style_source.hpp +++ b/include/mbgl/style/style_source.hpp @@ -29,16 +29,11 @@ public: }; -class StyleSource : public std::enable_shared_from_this<StyleSource> { +class StyleSource : private util::noncopyable { public: - util::ptr<SourceInfo> info; - + SourceInfo info; bool enabled = false; util::ptr<Source> source; - - StyleSource(const util::ptr<SourceInfo> &info_) - : info(info_) - {} }; } |