do not use value_type_traits when iterator_traits suffices

2013-05-07 18:53:14 +03:00 · 2013-05-07 18:53:14 +03:00 · c9a1b71c43
parent 9cb22fdd0e
commit c9a1b71c43
17 changed files with 21 additions and 19 deletions
--- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h
@ -145,7 +145,7 @@ write_off_points_and_normals(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::input_iterator<ForwardIterator>::value_type()),
 #endif
    normal_pmap);
 }
@ -247,7 +247,7 @@ write_off_points(
    make_dereference_property_map(first)
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type())
+    typename std::iterator_traits<ForwardIterator>::value_type())
 #endif
    );
 }
--- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
@ -140,7 +140,7 @@ write_xyz_points_and_normals(
    make_dereference_property_map(output),
 #else
    make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    normal_pmap);
 }
@ -238,7 +238,7 @@ write_xyz_points(
    make_dereference_property_map(output)
 #else
    make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type())
+      typename std::iterator_traits<ForwardIterator>::value_type())
 #endif
    );
 }
--- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h
+++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
@ -207,7 +207,7 @@ compute_average_spacing(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
    k);
 }
--- a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
@ -222,7 +222,7 @@ grid_simplify_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    epsilon);
 }
--- a/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
@ -360,7 +360,7 @@ improved_jet_smooth_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    k,
    iter_number,
--- a/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
@ -340,7 +340,7 @@ improved_laplacian_smooth_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    k,
    iter_number,
--- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
@ -251,7 +251,7 @@ jet_estimate_normals(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    normal_pmap,
    k,
--- a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
@ -226,7 +226,7 @@ jet_smooth_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
    k,
    degree_fitting,degree_monge);
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@ -704,7 +704,7 @@ mst_orient_normals(
      make_dereference_property_map(first),
 #else
      make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
      normal_pmap,
      k);
--- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
@ -241,7 +241,7 @@ pca_estimate_normals(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    normal_pmap,
    k);
--- a/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
@ -214,7 +214,7 @@ pca_smooth_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
    k);
 }
--- a/Point_set_processing_3/include/CGAL/radial_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/radial_orient_normals.h
@ -180,7 +180,7 @@ radial_orient_normals(
      make_dereference_property_map(first),
 #else
      make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
      normal_pmap);
 }
--- a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
@ -110,7 +110,7 @@ random_simplify_point_set(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
    removed_percentage);
 }
--- a/Point_set_processing_3/include/CGAL/remove_outliers.h
+++ b/Point_set_processing_3/include/CGAL/remove_outliers.h
@ -246,7 +246,7 @@ remove_outliers(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
    k,threshold_percent);
 }
--- a/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h
+++ b/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h
@ -244,7 +244,7 @@ remove_outliers_wrt_median_knn_sq_distance(
    make_dereference_property_map(first),
 #else
    make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
    k,threshold_percent);
 }
--- a/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
+++ b/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
@ -30,6 +30,7 @@
 #include <deque>
 #include <algorithm>
 #include <cmath>
+#include <iterator>

 #include <CGAL/trace.h>
 #include <CGAL/Reconstruction_triangulation_3.h>
@ -344,7 +345,7 @@ public:
      make_dereference_property_map(first),
 #else
      make_typed_identity_property_map_by_reference(
-      typename value_type_traits<InputIterator>::type()),
+      typename std::iterator_traits<InputIterator>::value_type()),
 #endif
      normal_pmap, Poisson_visitor());
    CGAL::Timer task_timer; task_timer.start();
--- a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
+++ b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
@ -37,6 +37,7 @@
 #include <boost/random/linear_congruential.hpp>

 #include <vector>
+#include <iterator>

 namespace CGAL {

@ -456,7 +457,7 @@ public:
      make_dereference_property_map(first),
 #else
      make_typed_identity_property_map_by_reference(
-      typename value_type_traits<InputIterator>::type()),
+      typename std::iterator_traits<InputIterator>::value_type()),
 #endif
      normal_pmap,
      visitor);