Commit faf41326 authored by Julien Michel's avatar Julien Michel
Browse files

COMP: Fixing redeclaration of boost::move error, more impacted files

parent 5b761bf5
......@@ -53,7 +53,7 @@ otb::ReprojectTransformationFunctor::ByCopy::operator()(TGeometry const* in) con
if (out)
m_Reprojector.do_transform(*out);
ogr::UniqueGeometryPtr res(out.release());
return boost::move(res);
return otb::move(res);
}
template <typename TGeometry>
......@@ -165,7 +165,7 @@ otb::ReprojectTransformationFunctor::operator()(OGRGeometry const* in) const
{
otb::ogr::UniqueGeometryPtr res
= ogr::apply<otb::ogr::UniqueGeometryPtr>(in, ByCopy(*this));
return boost::move(res);
return otb::move(res);
}
void otb::ReprojectTransformationFunctor::apply_inplace(OGRGeometry * inout) const
......
......@@ -88,7 +88,7 @@ void otb::TransformationFunctorDispatcher<TransformationFunctor,OGRGeometry>::op
// TODO: field transformations...
ogr::UniqueGeometryPtr g = m_functor(feat.GetGeometry());
ogr::Feature dest(defn);
dest.SetGeometryDirectly(boost::move(g));
dest.SetGeometryDirectly(otb::move(g));
out.CreateFeature(dest);
}
}
......@@ -107,7 +107,7 @@ void otb::TransformationFunctorDispatcher<TransformationFunctor,OGRGeometry>::op
ogr::Feature feat = *inout.start_at(i);
// TODO: field transformations...
ogr::UniqueGeometryPtr g = m_functor(feat.GetGeometry());
feat.SetGeometryDirectly(boost::move(g));
feat.SetGeometryDirectly(otb::move(g));
inout.SetFeature(feat);
}
}
......@@ -74,7 +74,7 @@ ReprojectTransformationFunctor::operator()(OGRGeometry const* in) const
itkGenericExceptionMacro(<< "Cannot reproject a geometry: " << CPLGetLastErrorMsg());
}
}
return boost::move(out);
return otb::move(out);
}
/*===========================================================================*/
......
......@@ -42,7 +42,7 @@ struct SwapXYFunctor
assert(!"Sorry, This example filter requires GDAL v1.9.0 or later");
#endif
}
return boost::move(out);
return otb::move(out);
}
};
......
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