From faf4132661d358efc5bc7e81a3067fa1f01f4055 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Tue, 19 Jun 2012 11:27:35 +0200
Subject: [PATCH] COMP: Fixing redeclaration of boost::move error, more
impacted files
---
Code/Projections/otbGeometriesProjectionFilter.cxx | 4 ++--
.../OGRAdapters/otbGeometriesToGeometriesFilter.txx | 4 ++--
Examples/Filtering/GeometriesChangeSpatialReference.cxx | 2 +-
Examples/Filtering/GeometriesFilter.cxx | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Code/Projections/otbGeometriesProjectionFilter.cxx b/Code/Projections/otbGeometriesProjectionFilter.cxx
index 96e770eb26..ffb86c6bb1 100644
--- a/Code/Projections/otbGeometriesProjectionFilter.cxx
+++ b/Code/Projections/otbGeometriesProjectionFilter.cxx
@@ -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
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx
index 5f54b78af6..91653bd1f7 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx
@@ -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);
}
}
diff --git a/Examples/Filtering/GeometriesChangeSpatialReference.cxx b/Examples/Filtering/GeometriesChangeSpatialReference.cxx
index 3d9cf26b81..158bb63b21 100644
--- a/Examples/Filtering/GeometriesChangeSpatialReference.cxx
+++ b/Examples/Filtering/GeometriesChangeSpatialReference.cxx
@@ -74,7 +74,7 @@ ReprojectTransformationFunctor::operator()(OGRGeometry const* in) const
itkGenericExceptionMacro(<< "Cannot reproject a geometry: " << CPLGetLastErrorMsg());
}
}
- return boost::move(out);
+ return otb::move(out);
}
/*===========================================================================*/
diff --git a/Examples/Filtering/GeometriesFilter.cxx b/Examples/Filtering/GeometriesFilter.cxx
index 37c564e43e..f0464f999c 100644
--- a/Examples/Filtering/GeometriesFilter.cxx
+++ b/Examples/Filtering/GeometriesFilter.cxx
@@ -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);
}
};
--
GitLab