Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
5b761bf5
Commit
5b761bf5
authored
Jun 19, 2012
by
Julien Michel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COMP: Fixing redeclaration of boost::move error
parent
81104c29
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
+10
-4
No files found.
Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
View file @
5b761bf5
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment