diff options
| author | Jan Lingscheid <jan.linscheid@auticon.de> | 2017-10-16 11:00:24 +0000 |
|---|---|---|
| committer | Jan Lingscheid <jan.lingscheid@auticon.de> | 2017-10-17 08:54:59 +0000 |
| commit | c943a6db760a6c5eb8110179c240e8f7bd021ac5 (patch) | |
| tree | dd8e510c611a8cab504f441f2c65924fd6e2da5a /src | |
| parent | Revive pango_win32 backend (diff) | |
| download | inkscape-c943a6db760a6c5eb8110179c240e8f7bd021ac5.tar.gz inkscape-c943a6db760a6c5eb8110179c240e8f7bd021ac5.zip | |
Remove std::auto_ptr
As C++11-compiler is now mandatory, conditional use of auto_ptr is no longer usefull.
This commit does not remove the usage of std::auto_ptr in 2geom.
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpe-interpolate_points.cpp | 4 | ||||
| -rw-r--r-- | src/ui/control-manager.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp index 0a0bcea14..7d4c88dc1 100644 --- a/src/live_effects/lpe-interpolate_points.cpp +++ b/src/live_effects/lpe-interpolate_points.cpp @@ -51,11 +51,7 @@ Geom::PathVector LPEInterpolatePoints::doEffect_path (Geom::PathVector const & path_in) { Geom::PathVector path_out; -#if __cplusplus <= 199711L - std::auto_ptr<Geom::Interpolate::Interpolator> interpolator( Geom::Interpolate::Interpolator::create(static_cast<Geom::Interpolate::InterpolatorType>(interpolator_type.get_value())) ); -#else std::unique_ptr<Geom::Interpolate::Interpolator> interpolator( Geom::Interpolate::Interpolator::create(static_cast<Geom::Interpolate::InterpolatorType>(interpolator_type.get_value())) ); -#endif for(Geom::PathVector::const_iterator path_it = path_in.begin(); path_it != path_in.end(); ++path_it) { if (path_it->empty()) diff --git a/src/ui/control-manager.h b/src/ui/control-manager.h index 3f090d0bd..418591991 100644 --- a/src/ui/control-manager.h +++ b/src/ui/control-manager.h @@ -76,11 +76,7 @@ public: private: ControlManager(); -#if __cplusplus <= 199711L - std::auto_ptr<ControlManagerImpl> _impl; -#else std::unique_ptr<ControlManagerImpl> _impl; -#endif friend class ControlManagerImpl; }; |