Commit 5b761bf5 authored by Julien Michel's avatar Julien Michel

COMP: Fixing redeclaration of boost::move error

parent 81104c29
......@@ -27,10 +27,16 @@
# include <boost/move/move.hpp> // since 1.48
#else
# include <boost/interprocess/detail/move.hpp>
namespace boost {
#endif
namespace otb
{
#if BOOST_VERSION >= 104800
using boost::move;
#else
using boost::interprocess::move;
} // boost namespace
#endif
}
/*===========================================================================*/
/*================================[ Feature ]================================*/
......@@ -138,7 +144,7 @@ void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
{
CheckInvariants();
OGRGeometry * g = geometry.get();
UncheckedSetGeometryDirectly(boost::move(geometry));
UncheckedSetGeometryDirectly(otb::move(geometry));
assert(m_Feature->GetGeometryRef() == g && "The new geometry hasn't been set as expected");
assert(! geometry && "UniqueGeometryPtr hasn't released its pointer");
}
......@@ -149,7 +155,7 @@ otb::ogr::UniqueGeometryPtr otb::ogr::Feature::StealGeometry()
CheckInvariants();
UniqueGeometryPtr res = UncheckedStealGeometry();
assert(! m_Feature->GetGeometryRef() && "Geometry hasn't been properly stolen");
return boost::move(res);
return otb::move(res);
}
inline
......
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