From e317c689aabd321dd101e8f65cbed2d714203e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Fri, 17 Jan 2020 18:28:57 +0100
Subject: [PATCH] Misc compilation fixes

---
 BGL/include/CGAL/boost/graph/io.h                | 12 ++++--------
 Stream_support/include/CGAL/IO/PLY.h             | 16 ++++++++--------
 Stream_support/include/CGAL/IO/STL/STL_reader.h  |  2 +-
 .../src/CGAL/File_writer_wavefront.cpp           |  4 ++--
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/BGL/include/CGAL/boost/graph/io.h b/BGL/include/CGAL/boost/graph/io.h
index 4caf6c04e32..9226436acee 100644
--- a/BGL/include/CGAL/boost/graph/io.h
+++ b/BGL/include/CGAL/boost/graph/io.h
@@ -25,15 +25,11 @@
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/properties.h>
-#include <CGAL/Kernel_traits.h>
-
-#ifdef CGAL_USE_VTK
-#include <CGAL/IO/VTK.h>
-#endif
-
 #include <CGAL/internal/Generic_facegraph_builder.h>
-#include <CGAL/IO/STL.h>
 #include <CGAL/IO/OBJ.h>
+#include <CGAL/IO/STL.h>
+#include <CGAL/IO/VTK.h>
+#include <CGAL/Kernel_traits.h>
 
 namespace CGAL {
   /*!
@@ -589,7 +585,7 @@ write_gocad(FaceGraph& face_graph, std::ostream& os, const std::string& name)
 }
 
 namespace internal {
-  namespace write_vtp {
+namespace write_vtp {
 
 // writes the polys appended data at the end of the .vtp file
 template <class Mesh,
diff --git a/Stream_support/include/CGAL/IO/PLY.h b/Stream_support/include/CGAL/IO/PLY.h
index c3bbd921818..7f1b3c2e509 100644
--- a/Stream_support/include/CGAL/IO/PLY.h
+++ b/Stream_support/include/CGAL/IO/PLY.h
@@ -791,7 +791,7 @@ template <typename ForwardIterator,
 void simple_property_write (std::ostream& stream, ForwardIterator it,
                             std::pair<PropertyMap, PLY_property<T> > map)
 {
-  if (CGAL::get_mode(stream) == IO::ASCII)
+  if (CGAL::get_mode(stream) == CGAL::IO::ASCII)
     stream << no_char_character(get (map.first, *it));
   else
   {
@@ -808,7 +808,7 @@ void simple_property_write (std::ostream& stream, ForwardIterator it,
 {
   const typename PropertyMap::reference value = get(map.first, *it);
     
-  if (CGAL::get_mode(stream) == IO::ASCII)
+  if (CGAL::get_mode(stream) == CGAL::IO::ASCII)
   {
     stream << value.size();
     for (std::size_t i = 0; i < value.size(); ++ i)
@@ -835,7 +835,7 @@ void output_properties (std::ostream& stream,
                         std::tuple<PropertyMap, PLY_property<T>... >&& current)
 {
   property_write (stream, it, std::get<0>(current));
-  if (get_mode(stream) == IO::ASCII)
+  if (get_mode(stream) == CGAL::IO::ASCII)
     stream << std::endl;
 }
 
@@ -848,7 +848,7 @@ void output_properties (std::ostream& stream,
                         std::pair<PropertyMap, PLY_property<T> >&& current)
 {
   simple_property_write (stream, it, std::forward<std::pair<PropertyMap, PLY_property<T> > >(current));
-  if (get_mode(stream) == IO::ASCII)
+  if (get_mode(stream) == CGAL::IO::ASCII)
     stream << std::endl;
 }
 
@@ -864,7 +864,7 @@ void output_properties (std::ostream& stream,
                         PropertyHandler&& ... properties)
 {
   simple_property_write (stream, it, current);
-  if (get_mode(stream) == IO::ASCII)
+  if (get_mode(stream) == CGAL::IO::ASCII)
     stream << " ";
   output_properties (stream, it, std::forward<NextPropertyHandler>(next),
                      std::forward<PropertyHandler>(properties)...);
@@ -882,7 +882,7 @@ void output_properties (std::ostream& stream,
                         PropertyHandler&& ... properties)
 {
   property_write (stream, it, std::get<0>(current));
-  if (get_mode(stream) == IO::ASCII)
+  if (get_mode(stream) == CGAL::IO::ASCII)
     stream << " ";
   output_properties (stream, it, std::forward<NextPropertyHandler>(next),
                      std::forward<PropertyHandler>(properties)...);
@@ -929,7 +929,7 @@ public:
     
   virtual void print(std::ostream& stream, const Index& index)
   {
-    if (get_mode(stream) == IO::ASCII)
+    if (get_mode(stream) == CGAL::IO::ASCII)
       stream << get(m_pmap, index);
     else
     {
@@ -952,7 +952,7 @@ public:
     
   virtual void print(std::ostream& stream, const Index& index)
   {
-    if (get_mode(stream) == IO::ASCII)
+    if (get_mode(stream) == CGAL::IO::ASCII)
       stream << int(get(m_pmap, index));
     else
     {
diff --git a/Stream_support/include/CGAL/IO/STL/STL_reader.h b/Stream_support/include/CGAL/IO/STL/STL_reader.h
index f8aca11f2ea..947c927491e 100644
--- a/Stream_support/include/CGAL/IO/STL/STL_reader.h
+++ b/Stream_support/include/CGAL/IO/STL/STL_reader.h
@@ -114,7 +114,7 @@ bool parse_ASCII_STL(std::istream& input,
                      bool verbose = false)
 {
   typedef typename PointRange::value_type Point;
-  typedef typename TriangleRange::value_type Triangle;
+
   if(verbose)
     std::cout << "Parsing ASCII file..." << std::endl;
 
diff --git a/Stream_support/src/CGAL/File_writer_wavefront.cpp b/Stream_support/src/CGAL/File_writer_wavefront.cpp
index df1de9738df..cbd7decb69b 100644
--- a/Stream_support/src/CGAL/File_writer_wavefront.cpp
+++ b/Stream_support/src/CGAL/File_writer_wavefront.cpp
@@ -16,8 +16,8 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/IO/File_writer_wavefront.h>
-#include <CGAL/IO/File_writer_wavefront_impl.h>
+#include <CGAL/IO/OBJ/File_writer_wavefront.h>
+#include <CGAL/IO/OBJ/File_writer_wavefront_impl.h>
 
 #endif // CGAL_HEADER_ONLY