songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7144 from sloriot/SS-faster_adapter 

Replace shared_ptr with a plain copy
This commit is contained in:
Laurent Rineau 2023-01-27 20:52:18 +01:00
parent 65f60e3190 ecb987a9bf
commit 68cca0f8a6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Spatial_searching/include/CGAL/Search_traits_adapter.h
View File

@ -142,14 +142,14 @@ public:
typedef typename boost::property_traits<PointPropertyMap>::value_type
Point;
std::shared_ptr<Point> point;
std::size_t idx;
Point point;
std::size_t idx = 0;
public:
No_lvalue_iterator() : point(NULL), idx(0) { }
No_lvalue_iterator(const Point& point) : point(new Point(point)), idx(0) { }
No_lvalue_iterator(const Point& point, int) : point(new Point(point)), idx(Base::Dimension::value) { }
No_lvalue_iterator() : point() { }
No_lvalue_iterator(const Point& point) : point(point) { }
No_lvalue_iterator(const Point& point, int) : point(point), idx(Base::Dimension::value) { }
private:
@ -157,18 +157,15 @@ public:
void increment()
{
++idx;
CGAL_assertion(point != std::shared_ptr<Point>());
}
void decrement()
{
--idx;
CGAL_assertion(point != std::shared_ptr<Point>());
}
void advance(std::ptrdiff_t n)
{
idx += n;
CGAL_assertion(point != std::shared_ptr<Point>());
}
std::ptrdiff_t distance_to(const No_lvalue_iterator& other) const
@ -185,7 +182,7 @@ public:
dereference() const
{
// Point::operator[] takes an int as parameter...
return const_cast<Dereference_type&>((*point)[static_cast<int>(idx)]);
return const_cast<Dereference_type&>(point[static_cast<int>(idx)]);
}
};