songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc compilation fixes

This commit is contained in:
Mael Rouxel-Labbé 2020-01-17 18:28:57 +01:00
parent 3bfc9ab9ea
commit e317c689aa
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BGL/include/CGAL/boost/graph/io.h
View File

@ -25,15 +25,11 @@
#include <CGAL/boost/graph/named_params_helper.h> #include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/Named_function_parameters.h> #include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/properties.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/internal/Generic_facegraph_builder.h>
#include <CGAL/IO/STL.h>
#include <CGAL/IO/OBJ.h> #include <CGAL/IO/OBJ.h>
#include <CGAL/IO/STL.h>
#include <CGAL/IO/VTK.h>
#include <CGAL/Kernel_traits.h>
namespace CGAL { namespace CGAL {
/*! /*!
@ -589,7 +585,7 @@ write_gocad(FaceGraph& face_graph, std::ostream& os, const std::string& name)
} }
namespace internal { namespace internal {
namespace write_vtp { namespace write_vtp {
// writes the polys appended data at the end of the .vtp file // writes the polys appended data at the end of the .vtp file
template <class Mesh, template <class Mesh,

16
Stream_support/include/CGAL/IO/PLY.h
View File

@ -791,7 +791,7 @@ template <typename ForwardIterator,
void simple_property_write (std::ostream& stream, ForwardIterator it, void simple_property_write (std::ostream& stream, ForwardIterator it,
std::pair<PropertyMap, PLY_property<T> > map) 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)); stream << no_char_character(get (map.first, *it));
else else
{ {
@ -808,7 +808,7 @@ void simple_property_write (std::ostream& stream, ForwardIterator it,
{ {
const typename PropertyMap::reference value = get(map.first, *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(); stream << value.size();
for (std::size_t i = 0; i < value.size(); ++ i) 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) std::tuple<PropertyMap, PLY_property<T>... >&& current)
{ {
property_write (stream, it, std::get<0>(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; stream << std::endl;
} }
@ -848,7 +848,7 @@ void output_properties (std::ostream& stream,
std::pair<PropertyMap, PLY_property<T> >&& current) std::pair<PropertyMap, PLY_property<T> >&& current)
{ {
simple_property_write (stream, it, std::forward<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; stream << std::endl;
} }
@ -864,7 +864,7 @@ void output_properties (std::ostream& stream,
PropertyHandler&& ... properties) PropertyHandler&& ... properties)
{ {
simple_property_write (stream, it, current); simple_property_write (stream, it, current);
if (get_mode(stream) == IO::ASCII) if (get_mode(stream) == CGAL::IO::ASCII)
stream << " "; stream << " ";
output_properties (stream, it, std::forward<NextPropertyHandler>(next), output_properties (stream, it, std::forward<NextPropertyHandler>(next),
std::forward<PropertyHandler>(properties)...); std::forward<PropertyHandler>(properties)...);
@ -882,7 +882,7 @@ void output_properties (std::ostream& stream,
PropertyHandler&& ... properties) PropertyHandler&& ... properties)
{ {
property_write (stream, it, std::get<0>(current)); property_write (stream, it, std::get<0>(current));
if (get_mode(stream) == IO::ASCII) if (get_mode(stream) == CGAL::IO::ASCII)
stream << " "; stream << " ";
output_properties (stream, it, std::forward<NextPropertyHandler>(next), output_properties (stream, it, std::forward<NextPropertyHandler>(next),
std::forward<PropertyHandler>(properties)...); std::forward<PropertyHandler>(properties)...);
@ -929,7 +929,7 @@ public:
virtual void print(std::ostream& stream, const Index& index) 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); stream << get(m_pmap, index);
else else
{ {
@ -952,7 +952,7 @@ public:
virtual void print(std::ostream& stream, const Index& index) 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)); stream << int(get(m_pmap, index));
else else
{ {

2
Stream_support/include/CGAL/IO/STL/STL_reader.h
View File

@ -114,7 +114,7 @@ bool parse_ASCII_STL(std::istream& input,
bool verbose = false) bool verbose = false)
{ {
typedef typename PointRange::value_type Point; typedef typename PointRange::value_type Point;
typedef typename TriangleRange::value_type Triangle;
if(verbose) if(verbose)
std::cout << "Parsing ASCII file..." << std::endl; std::cout << "Parsing ASCII file..." << std::endl;

4
Stream_support/src/CGAL/File_writer_wavefront.cpp
View File

@ -16,8 +16,8 @@
#ifndef CGAL_HEADER_ONLY #ifndef CGAL_HEADER_ONLY
#include <CGAL/IO/File_writer_wavefront.h> #include <CGAL/IO/OBJ/File_writer_wavefront.h>
#include <CGAL/IO/File_writer_wavefront_impl.h> #include <CGAL/IO/OBJ/File_writer_wavefront_impl.h>
#endif // CGAL_HEADER_ONLY #endif // CGAL_HEADER_ONLY