do not use value_type_traits when iterator_traits suffices

This commit is contained in:
iyaz 2013-05-07 18:53:14 +03:00
parent 9cb22fdd0e
commit c9a1b71c43
17 changed files with 21 additions and 19 deletions

View File

@ -145,7 +145,7 @@ write_off_points_and_normals(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::input_iterator<ForwardIterator>::value_type()),
#endif #endif
normal_pmap); normal_pmap);
} }
@ -247,7 +247,7 @@ write_off_points(
make_dereference_property_map(first) make_dereference_property_map(first)
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()) typename std::iterator_traits<ForwardIterator>::value_type())
#endif #endif
); );
} }

View File

@ -140,7 +140,7 @@ write_xyz_points_and_normals(
make_dereference_property_map(output), make_dereference_property_map(output),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
normal_pmap); normal_pmap);
} }
@ -238,7 +238,7 @@ write_xyz_points(
make_dereference_property_map(output) make_dereference_property_map(output)
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()) typename std::iterator_traits<ForwardIterator>::value_type())
#endif #endif
); );
} }

View File

@ -207,7 +207,7 @@ compute_average_spacing(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
k); k);
} }

View File

@ -222,7 +222,7 @@ grid_simplify_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
epsilon); epsilon);
} }

View File

@ -360,7 +360,7 @@ improved_jet_smooth_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
k, k,
iter_number, iter_number,

View File

@ -340,7 +340,7 @@ improved_laplacian_smooth_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
k, k,
iter_number, iter_number,

View File

@ -251,7 +251,7 @@ jet_estimate_normals(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
normal_pmap, normal_pmap,
k, k,

View File

@ -226,7 +226,7 @@ jet_smooth_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
k, k,
degree_fitting,degree_monge); degree_fitting,degree_monge);

View File

@ -704,7 +704,7 @@ mst_orient_normals(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
normal_pmap, normal_pmap,
k); k);

View File

@ -241,7 +241,7 @@ pca_estimate_normals(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
normal_pmap, normal_pmap,
k); k);

View File

@ -214,7 +214,7 @@ pca_smooth_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
k); k);
} }

View File

@ -180,7 +180,7 @@ radial_orient_normals(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
normal_pmap); normal_pmap);
} }

View File

@ -110,7 +110,7 @@ random_simplify_point_set(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<ForwardIterator>::type()), typename std::iterator_traits<ForwardIterator>::value_type()),
#endif #endif
removed_percentage); removed_percentage);
} }

View File

@ -246,7 +246,7 @@ remove_outliers(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
k,threshold_percent); k,threshold_percent);
} }

View File

@ -244,7 +244,7 @@ remove_outliers_wrt_median_knn_sq_distance(
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
k,threshold_percent); k,threshold_percent);
} }

View File

@ -30,6 +30,7 @@
#include <deque> #include <deque>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <iterator>
#include <CGAL/trace.h> #include <CGAL/trace.h>
#include <CGAL/Reconstruction_triangulation_3.h> #include <CGAL/Reconstruction_triangulation_3.h>
@ -344,7 +345,7 @@ public:
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
normal_pmap, Poisson_visitor()); normal_pmap, Poisson_visitor());
CGAL::Timer task_timer; task_timer.start(); CGAL::Timer task_timer; task_timer.start();

View File

@ -37,6 +37,7 @@
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include <vector> #include <vector>
#include <iterator>
namespace CGAL { namespace CGAL {
@ -456,7 +457,7 @@ public:
make_dereference_property_map(first), make_dereference_property_map(first),
#else #else
make_typed_identity_property_map_by_reference( make_typed_identity_property_map_by_reference(
typename value_type_traits<InputIterator>::type()), typename std::iterator_traits<InputIterator>::value_type()),
#endif #endif
normal_pmap, normal_pmap,
visitor); visitor);