Use proper (cpp98) namespace for CGAL functional functions

This commit is contained in:
Mael Rouxel-Labbé 2018-06-21 10:19:57 +02:00
parent 7490f34560
commit a878f9ca35
3 changed files with 9 additions and 6 deletions

View File

@ -38,6 +38,7 @@
#include <CGAL/Bbox_3.h>
#include <CGAL/Double_map.h>
#include <CGAL/enum.h>
#include <CGAL/functional.h>
#include <CGAL/internal/Has_member_visited.h>
#include <CGAL/iterator.h>
#include <CGAL/Real_timer.h>
@ -86,11 +87,11 @@ namespace details { // various function objects
// to use them. -- Laurent Rineau, 2007/07/27
template <typename Map>
struct Second_of
: public CGAL::unary_function<typename Map::value_type,
const typename Map::mapped_type&>
: public CGAL::cpp98::unary_function<typename Map::value_type,
const typename Map::mapped_type&>
{
typedef CGAL::unary_function<typename Map::value_type,
const typename Map::mapped_type&> Base;
typedef CGAL::cpp98::unary_function<typename Map::value_type,
const typename Map::mapped_type&> Base;
typedef typename Base::result_type result_type;
typedef typename Base::argument_type argument_type;

View File

@ -36,6 +36,8 @@
#include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_3.h>
#include <CGAL/functional.h>
#include <CGAL/boost/iterator/transform_iterator.hpp>
namespace CGAL {
@ -121,7 +123,7 @@ private:
* Used by boost transform iterator
*/
struct Extract_point :
public CGAL::unary_function<typename Tr::Vertex, Weighted_point>
public CGAL::cpp98::unary_function<typename Tr::Vertex, Weighted_point>
{
Weighted_point operator()(const typename Tr::Vertex& v) const { return v.point(); }
};

View File

@ -177,7 +177,7 @@ FT split_p (const Point& p)
}
struct Segments_function
: public CGAL::unary_function<Point, FT>
: public CGAL::cpp98::unary_function<Point, FT>
{
typedef std::vector<Segment> Segments;