diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-11-16 22:57:28 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-11-16 22:57:28 +0000 |
| commit | 8bd87961810251cac534f8f308a4b91e5d21afe0 (patch) | |
| tree | c9e981e83392ab6d717ae06e46d8a12735b28c56 /src/ui | |
| parent | static code analysis (diff) | |
| download | inkscape-8bd87961810251cac534f8f308a4b91e5d21afe0.tar.gz inkscape-8bd87961810251cac534f8f308a4b91e5d21afe0.zip | |
removes warnings when compiling with c++11 using uniqueptr instead of autoptr
(bzr r14475)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/control-manager.h | 6 | ||||
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.h | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ui/control-manager.h b/src/ui/control-manager.h index 05a53f6a0..964ad0a29 100644 --- a/src/ui/control-manager.h +++ b/src/ui/control-manager.h @@ -74,9 +74,11 @@ public: private: ControlManager(); - +#if __cplusplus <= 199711L std::auto_ptr<ControlManagerImpl> _impl; - +#else + std::unique_ptr<ControlManagerImpl> _impl; +#endif friend class ControlManagerImpl; }; diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index a067cd70c..283abb5b0 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -127,7 +127,11 @@ private: Gtk::Button _add; Glib::RefPtr<Gtk::Menu> _menu; sigc::signal<void> _signal_filter_changed; +#if __cplusplus <= 199711L std::auto_ptr<Inkscape::XML::SignalObserver> _observer; +#else + std::unique_ptr<Inkscape::XML::SignalObserver> _observer; +#endif }; class PrimitiveColumns : public Gtk::TreeModel::ColumnRecord @@ -243,7 +247,11 @@ private: sigc::connection _scroll_connection; int _autoscroll_y; int _autoscroll_x; +#if __cplusplus <= 199711L std::auto_ptr<Inkscape::XML::SignalObserver> _observer; +#else + std::unique_ptr<Inkscape::XML::SignalObserver> _observer; +#endif int _input_type_width; int _input_type_height; }; |