From 7cfb944afb5e15bd31e8ff1d5e2f2c53e3f2457f Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Thu, 19 Nov 2020 12:11:51 +0100
Subject: [PATCH] Fixes

---
 BGL/test/BGL/test_3mf_to_sm.cpp                               | 2 +-
 .../Point_set_processing_3/orient_scanlines_example.cpp       | 4 ++--
 Point_set_processing_3/include/CGAL/IO/read_las_points.h      | 4 ++--
 Point_set_processing_3/include/CGAL/IO/read_ply_points.h      | 4 ++--
 Stream_support/test/Stream_support/CMakeLists.txt             | 1 +
 Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h               | 2 --
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/BGL/test/BGL/test_3mf_to_sm.cpp b/BGL/test/BGL/test_3mf_to_sm.cpp
index 9604c019914..20d55a4924a 100644
--- a/BGL/test/BGL/test_3mf_to_sm.cpp
+++ b/BGL/test/BGL/test_3mf_to_sm.cpp
@@ -40,7 +40,7 @@ int main(int argc, char** argv)
   //testing reading functions.
   if(!CGAL::read_3MF(filename, meshes))
     return 1;
-  for(int i = 0; i< meshes.size(); ++i)
+  for(std::size_t i = 0; i< meshes.size(); ++i)
   {
     Mesh mesh = meshes[i];
     std::cout<<"mesh "<<i<<" is valid: "<<mesh.is_valid()<<std::endl;
diff --git a/Point_set_processing_3/examples/Point_set_processing_3/orient_scanlines_example.cpp b/Point_set_processing_3/examples/Point_set_processing_3/orient_scanlines_example.cpp
index 90bb4a11917..9e6beca4da1 100644
--- a/Point_set_processing_3/examples/Point_set_processing_3/orient_scanlines_example.cpp
+++ b/Point_set_processing_3/examples/Point_set_processing_3/orient_scanlines_example.cpp
@@ -17,7 +17,7 @@ void dump (const char* filename, const std::vector<Point_with_info>& points)
 {
   std::ofstream ofile (filename, std::ios::binary);
   CGAL::set_binary_mode(ofile);
-  CGAL::write_ply_points
+  CGAL::write_PLY
     (ofile, points,
      CGAL::parameters::point_map (Point_map()).
      normal_map (Normal_map()));
@@ -33,7 +33,7 @@ int main (int argc, char** argv)
   std::cerr << "Reading input file " << fname << std::endl;
   std::ifstream ifile (fname, std::ios::binary);
   if (!ifile ||
-      !CGAL::read_las_points_with_properties
+      !CGAL::read_LAS_with_properties
       (ifile, std::back_inserter (points),
        CGAL::make_las_point_reader (Point_map()),
        std::make_pair (Scan_angle_map(),
diff --git a/Point_set_processing_3/include/CGAL/IO/read_las_points.h b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
index f4f781f732b..26addc335c9 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_las_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
@@ -614,7 +614,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
                                                      OutputIterator output,
                                                      PropertyHandler&& ... properties)
 {
-  return read_LAS(is, output, std::forward<PropertyHandler>(properties)...);
+  return read_LAS_with_properties(is, output, std::forward<PropertyHandler>(properties)...);
 }
 
 /// \cond SKIP_IN_MANUAL
@@ -627,7 +627,7 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is,
 {
   typedef typename value_type_traits<OutputIterator>::type OutputValueType;
 
-  return read_LAS<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
+  return read_LAS_with_properties<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
 }
 
 /// \endcond
diff --git a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
index b3c3083d27a..7fffd53a18e 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
@@ -481,7 +481,7 @@ bool read_ply_points(std::istream& is, ///< input stream.
 template <typename OutputIteratorValueType, typename OutputIterator, typename ... PropertyHandler>
 CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIterator output, PropertyHandler&& ... properties)
 {
-  return read_PLY(is, output, std::forward<PropertyHandler>(properties)...);
+  return read_PLY_with_properties(is, output, std::forward<PropertyHandler>(properties)...);
 }
 
 /**
@@ -504,7 +504,7 @@ CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIte
 {
   typedef typename value_type_traits<OutputIterator>::type OutputValueType;
 
-  return read_PLY<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
+  return read_PLY_with_properties<OutputValueType>(is, output, std::forward<PropertyHandler>(properties)...);
 }
 
 template <typename OutputIteratorValueType,
diff --git a/Stream_support/test/Stream_support/CMakeLists.txt b/Stream_support/test/Stream_support/CMakeLists.txt
index 1cb32619d17..dd5f19823a3 100644
--- a/Stream_support/test/Stream_support/CMakeLists.txt
+++ b/Stream_support/test/Stream_support/CMakeLists.txt
@@ -2,6 +2,7 @@
 # This is the CMake script for compiling a CGAL application.
 
 cmake_minimum_required(VERSION 3.1...3.15)
+project(Stream_support_Tests)
 find_package(CGAL REQUIRED)
 find_path(
   3MF_INCLUDE_DIR
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
index 3a162016ea5..f4eb8ac375a 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h
@@ -332,8 +332,6 @@ bool read_OFF(std::istream& is,
               Surface_mesh<Point>& sm,
               const CGAL_BGL_NP_CLASS& np)
 {
-  typedef Surface_mesh<Point>                                               Mesh;
-
   using parameters::choose_parameter;
   using parameters::get_parameter;
   using parameters::is_default_parameter;