diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2015-12-07 10:00:35 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-12-07 10:00:35 +0000 |
| commit | 457c41675d69c7463c3590ad9b8e43bcae20e611 (patch) | |
| tree | 43d1f8d4e350a3070944bbd7bb4ad265c1b6ed02 /src/live_effects/lpe-interpolate_points.cpp | |
| parent | merge from trunk (r14473) (diff) | |
| parent | Remove leftover assert. (diff) | |
| download | inkscape-457c41675d69c7463c3590ad9b8e43bcae20e611.tar.gz inkscape-457c41675d69c7463c3590ad9b8e43bcae20e611.zip | |
merge from trunk (r14506)
(bzr r14425.1.4)
Diffstat (limited to 'src/live_effects/lpe-interpolate_points.cpp')
| -rw-r--r-- | src/live_effects/lpe-interpolate_points.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/live_effects/lpe-interpolate_points.cpp b/src/live_effects/lpe-interpolate_points.cpp index 4ac139752..cf70832ee 100644 --- a/src/live_effects/lpe-interpolate_points.cpp +++ b/src/live_effects/lpe-interpolate_points.cpp @@ -52,8 +52,11 @@ 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()) |