From 99e7f4806a1c8b18b98a76c7b4ba39d345e55c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Sun, 23 Apr 2023 18:43:10 +0200 Subject: [PATCH] boost::int -> std::int --- CGAL_ImageIO/include/CGAL/ImageIO/bmptypes.h | 2 +- .../include/CGAL/Image_3_vtk_interface.h | 4 +- .../Hyperbolic_triangulation_face_base_2.h | 2 +- .../include/CGAL/known_bit_size_integers.h | 8 ++-- .../Number_types/known_bit_size_integers.cpp | 8 ++-- .../Point_set_3/point_set_read_ply.cpp | 4 +- Point_set_3/include/CGAL/Point_set_3/IO/PLY.h | 30 ++++++------ .../Classification/Cluster_classification.cpp | 6 +-- .../Point_set_item_classification.cpp | 6 +-- .../Display/Display_property_plugin.cpp | 48 +++++++++---------- .../demo/Polyhedron/Scene_image_item.cpp | 4 +- Random_numbers/include/CGAL/Random_impl.h | 6 +-- Spatial_searching/include/CGAL/Kd_tree_node.h | 4 +- .../CGAL/IO/OFF/File_header_OFF_impl.h | 2 +- .../include/CGAL/IO/OFF/File_scanner_OFF.h | 8 ++-- .../include/CGAL/IO/OFF/File_writer_OFF.h | 4 +- Stream_support/include/CGAL/IO/PLY.h | 8 ++-- .../include/CGAL/IO/PLY/PLY_reader.h | 18 +++---- .../include/CGAL/Surface_mesh/IO/PLY.h | 40 ++++++++-------- .../Triangulation_3/test_regular_remove_3.cpp | 2 +- 20 files changed, 107 insertions(+), 107 deletions(-) diff --git a/CGAL_ImageIO/include/CGAL/ImageIO/bmptypes.h b/CGAL_ImageIO/include/CGAL/ImageIO/bmptypes.h index 83841c5f579..9c27b948b3d 100644 --- a/CGAL_ImageIO/include/CGAL/ImageIO/bmptypes.h +++ b/CGAL_ImageIO/include/CGAL/ImageIO/bmptypes.h @@ -39,7 +39,7 @@ typedef char CGAL_INT8; typedef short CGAL_INT16; -typedef boost::int32_t CGAL_INT32; +typedef std::int32_t CGAL_INT32; typedef unsigned char CGAL_UINT8; typedef unsigned short CGAL_UINT16; typedef std::uint32_t CGAL_UINT32; diff --git a/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h b/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h index d4fa5b776b8..99a7f528f17 100644 --- a/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h +++ b/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h @@ -61,7 +61,7 @@ struct VTK_type_generator { }; template <> -struct VTK_type_generator { +struct VTK_type_generator { static const int type = VTK_SHORT; typedef vtkShortArray ArrayType; }; @@ -73,7 +73,7 @@ struct VTK_type_generator { }; template <> -struct VTK_type_generator { +struct VTK_type_generator { static const int type = VTK_INT; typedef vtkIntArray ArrayType; }; diff --git a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_triangulation_face_base_2.h b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_triangulation_face_base_2.h index 32d730aab7c..724f45794e6 100644 --- a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_triangulation_face_base_2.h +++ b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_triangulation_face_base_2.h @@ -23,7 +23,7 @@ namespace CGAL { class Hyperbolic_data { - typedef boost::int8_t Id; + typedef std::int8_t Id; private: // - 2 for infinite face diff --git a/Number_types/include/CGAL/known_bit_size_integers.h b/Number_types/include/CGAL/known_bit_size_integers.h index c4871baa329..c5bc43fed54 100644 --- a/Number_types/include/CGAL/known_bit_size_integers.h +++ b/Number_types/include/CGAL/known_bit_size_integers.h @@ -34,9 +34,9 @@ namespace CGAL { - typedef boost::int8_t Integer8; - typedef boost::int16_t Integer16; - typedef boost::int32_t Integer32; + typedef std::int8_t Integer8; + typedef std::int16_t Integer16; + typedef std::int32_t Integer32; typedef std::uint8_t UInteger8; typedef std::uint16_t UInteger16; @@ -45,7 +45,7 @@ namespace CGAL { #ifndef BOOST_NO_INT64_T // this macro is still provided but its use is discouraged # define CGAL_HAS_INTEGER64 - typedef boost::int64_t Integer64; + typedef std::int64_t Integer64; typedef std::uint64_t UInteger64; #endif diff --git a/Number_types/test/Number_types/known_bit_size_integers.cpp b/Number_types/test/Number_types/known_bit_size_integers.cpp index d7799f60266..93f2be8d6ec 100644 --- a/Number_types/test/Number_types/known_bit_size_integers.cpp +++ b/Number_types/test/Number_types/known_bit_size_integers.cpp @@ -7,11 +7,11 @@ int main() std::cout << "Verifying the sizes of boost::[u]int{8,16,32,64}_t" << std::endl; - CGAL_static_assertion(sizeof(boost::int8_t) == 1); - CGAL_static_assertion(sizeof(boost::int16_t) == 2); - CGAL_static_assertion(sizeof(boost::int32_t) == 4); + CGAL_static_assertion(sizeof(std::int8_t) == 1); + CGAL_static_assertion(sizeof(std::int16_t) == 2); + CGAL_static_assertion(sizeof(std::int32_t) == 4); #ifndef BOOST_NO_INT64_T - CGAL_static_assertion(sizeof(boost::int64_t) == 8); + CGAL_static_assertion(sizeof(std::int64_t) == 8); #endif CGAL_static_assertion(sizeof(std::uint8_t) == 1); diff --git a/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp b/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp index 01add66acb1..f0ecd03904f 100644 --- a/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp +++ b/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp @@ -32,9 +32,9 @@ int main (int argc, char** argv) std::cerr << " * " << properties[i] << std::endl; // Recover "label" property of type int - Point_set::Property_map label_prop; + Point_set::Property_map label_prop; bool found = false; - boost::tie(label_prop, found) = point_set.property_map ("label"); + boost::tie(label_prop, found) = point_set.property_map ("label"); if(found) { diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h index 147d38e1139..9e5dafbd289 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h @@ -118,10 +118,10 @@ public: continue; } - if(dynamic_cast*>(property)) + if(dynamic_cast*>(property)) { m_properties.push_back - (new PLY_property_to_point_set_property(m_point_set, + (new PLY_property_to_point_set_property(m_point_set, name)); } else if(dynamic_cast*>(property)) @@ -130,10 +130,10 @@ public: (new PLY_property_to_point_set_property(m_point_set, name)); } - else if(dynamic_cast*>(property)) + else if(dynamic_cast*>(property)) { m_properties.push_back - (new PLY_property_to_point_set_property(m_point_set, + (new PLY_property_to_point_set_property(m_point_set, name)); } else if(dynamic_cast*>(property)) @@ -142,10 +142,10 @@ public: (new PLY_property_to_point_set_property(m_point_set, name)); } - else if(dynamic_cast*>(property)) + else if(dynamic_cast*>(property)) { m_properties.push_back - (new PLY_property_to_point_set_property(m_point_set, + (new PLY_property_to_point_set_property(m_point_set, name)); } else if(dynamic_cast*>(property)) @@ -456,13 +456,13 @@ bool write_PLY(std::ostream& os, typedef typename Point_set::Index Index; typedef typename Point_set::Point_map Point_map; typedef typename Point_set::Vector_map Vector_map; - typedef typename Point_set::template Property_map Int8_map; + typedef typename Point_set::template Property_map Int8_map; typedef typename Point_set::template Property_map Uint8_map; - typedef typename Point_set::template Property_map Int16_map; + typedef typename Point_set::template Property_map Int16_map; typedef typename Point_set::template Property_map Uint16_map; - typedef typename Point_set::template Property_map Int32_map; + typedef typename Point_set::template Property_map Int32_map; typedef typename Point_set::template Property_map Uint32_map; - typedef typename Point_set::template Property_map Int64_map; + typedef typename Point_set::template Property_map Int64_map; typedef typename Point_set::template Property_map Uint64_map; typedef typename Point_set::template Property_map Float_map; typedef typename Point_set::template Property_map Double_map; @@ -541,7 +541,7 @@ bool write_PLY(std::ostream& os, bool okay = false; { Int8_map pmap; - boost::tie(pmap, okay) = point_set.template property_map(prop[i]); + boost::tie(pmap, okay) = point_set.template property_map(prop[i]); if(okay) { os << "property char " << prop[i] << std::endl; @@ -561,7 +561,7 @@ bool write_PLY(std::ostream& os, } { Int16_map pmap; - boost::tie(pmap, okay) = point_set.template property_map(prop[i]); + boost::tie(pmap, okay) = point_set.template property_map(prop[i]); if(okay) { os << "property short " << prop[i] << std::endl; @@ -581,7 +581,7 @@ bool write_PLY(std::ostream& os, } { Int32_map pmap; - boost::tie(pmap, okay) = point_set.template property_map(prop[i]); + boost::tie(pmap, okay) = point_set.template property_map(prop[i]); if(okay) { os << "property int " << prop[i] << std::endl; @@ -601,11 +601,11 @@ bool write_PLY(std::ostream& os, } { Int64_map pmap; - boost::tie(pmap, okay) = point_set.template property_map(prop[i]); + boost::tie(pmap, okay) = point_set.template property_map(prop[i]); if(okay) { os << "property int " << prop[i] << std::endl; - printers.push_back(new internal::Simple_property_printer(pmap)); + printers.push_back(new internal::Simple_property_printer(pmap)); continue; } } diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp index 03d16d3eef9..cc1393e2ec2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp @@ -773,15 +773,15 @@ void Cluster_classification::add_remaining_point_set_properties_as_features(Feat prop[i] == "r" || prop[i] == "g" || prop[i] == "b") continue; - if (try_adding_simple_feature(feature_set, prop[i])) + if (try_adding_simple_feature(feature_set, prop[i])) continue; if (try_adding_simple_feature(feature_set, prop[i])) continue; - if (try_adding_simple_feature(feature_set, prop[i])) + if (try_adding_simple_feature(feature_set, prop[i])) continue; if (try_adding_simple_feature(feature_set, prop[i])) continue; - if (try_adding_simple_feature(feature_set, prop[i])) + if (try_adding_simple_feature(feature_set, prop[i])) continue; if (try_adding_simple_feature(feature_set, prop[i])) continue; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp index 23aa1094f9e..617692963d1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp @@ -668,15 +668,15 @@ void Point_set_item_classification::add_remaining_point_set_properties_as_featur prop[i] == "r" || prop[i] == "g" || prop[i] == "b") continue; - if (try_adding_simple_feature(prop[i])) + if (try_adding_simple_feature(prop[i])) continue; if (try_adding_simple_feature(prop[i])) continue; - if (try_adding_simple_feature(prop[i])) + if (try_adding_simple_feature(prop[i])) continue; if (try_adding_simple_feature(prop[i])) continue; - if (try_adding_simple_feature(prop[i])) + if (try_adding_simple_feature(prop[i])) continue; if (try_adding_simple_feature(prop[i])) continue; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp index 3e2f7003882..51f960a7cb4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp @@ -1754,7 +1754,7 @@ private: return false; } - if(ps->template property_map(name).second) + if(ps->template property_map(name).second) { return true; } @@ -1762,7 +1762,7 @@ private: { return true; } - if(ps->template property_map(name).second) + if(ps->template property_map(name).second) { return true; } @@ -1770,7 +1770,7 @@ private: { return true; } - if(ps->template property_map(name).second) + if(ps->template property_map(name).second) { return true; } @@ -1778,7 +1778,7 @@ private: { return true; } - if(ps->template property_map(name).second) + if(ps->template property_map(name).second) { return true; } @@ -1801,7 +1801,7 @@ private: bool DisplayPropertyPlugin::is_property_scalar(std::string name, const SMesh* sm) { - if(sm->template property_map(name).second) + if(sm->template property_map(name).second) { return true; } @@ -1809,7 +1809,7 @@ private: { return true; } - if(sm->template property_map(name).second) + if(sm->template property_map(name).second) { return true; } @@ -1817,7 +1817,7 @@ private: { return true; } - if(sm->template property_map(name).second) + if(sm->template property_map(name).second) { return true; } @@ -1825,7 +1825,7 @@ private: { return true; } - if(sm->template property_map(name).second) + if(sm->template property_map(name).second) { return true; } @@ -1846,13 +1846,13 @@ private: bool DisplayPropertyPlugin::treat_point_property(std::string name, Point_set* ps) { - typedef typename Point_set::template Property_map Int8_map; + typedef typename Point_set::template Property_map Int8_map; typedef typename Point_set::template Property_map Uint8_map; - typedef typename Point_set::template Property_map Int16_map; + typedef typename Point_set::template Property_map Int16_map; typedef typename Point_set::template Property_map Uint16_map; - typedef typename Point_set::template Property_map Int32_map; + typedef typename Point_set::template Property_map Int32_map; typedef typename Point_set::template Property_map Uint32_map; - typedef typename Point_set::template Property_map Int64_map; + typedef typename Point_set::template Property_map Int64_map; typedef typename Point_set::template Property_map Uint64_map; typedef typename Point_set::template Property_map Float_map; typedef typename Point_set::template Property_map Double_map; @@ -1860,7 +1860,7 @@ private: bool okay = false; { Int8_map pmap; - std::tie(pmap, okay) = ps->property_map(name); + std::tie(pmap, okay) = ps->property_map(name); if(okay) { return displayPSProperty(ps, pmap); @@ -1878,7 +1878,7 @@ private: { Int16_map pmap; - std::tie(pmap, okay) = ps->property_map(name); + std::tie(pmap, okay) = ps->property_map(name); if(okay) { return displayPSProperty(ps, pmap); @@ -1896,7 +1896,7 @@ private: { Int32_map pmap; - std::tie(pmap, okay) = ps->property_map(name); + std::tie(pmap, okay) = ps->property_map(name); if(okay) { return displayPSProperty(ps, pmap); @@ -1914,7 +1914,7 @@ private: { Int64_map pmap; - std::tie(pmap, okay) = ps->property_map(name); + std::tie(pmap, okay) = ps->property_map(name); if(okay) { return displayPSProperty(ps, pmap); @@ -1953,13 +1953,13 @@ private: template bool DisplayPropertyPlugin::treat_sm_property(std::string name, SMesh* sm) { - typedef typename SMesh::template Property_map Int8_map; + typedef typename SMesh::template Property_map Int8_map; typedef typename SMesh::template Property_map Uint8_map; - typedef typename SMesh::template Property_map Int16_map; + typedef typename SMesh::template Property_map Int16_map; typedef typename SMesh::template Property_map Uint16_map; - typedef typename SMesh::template Property_map Int32_map; + typedef typename SMesh::template Property_map Int32_map; typedef typename SMesh::template Property_map Uint32_map; - typedef typename SMesh::template Property_map Int64_map; + typedef typename SMesh::template Property_map Int64_map; typedef typename SMesh::template Property_map Uint64_map; typedef typename SMesh::template Property_map Float_map; typedef typename SMesh::template Property_map Double_map; @@ -1967,7 +1967,7 @@ private: bool okay = false; { Int8_map pmap; - std::tie(pmap, okay) = sm->property_map(name); + std::tie(pmap, okay) = sm->property_map(name); if(okay) { return displaySMProperty(*sm, pmap, TAG()); @@ -1985,7 +1985,7 @@ private: { Int16_map pmap; - std::tie(pmap, okay) = sm->property_map(name); + std::tie(pmap, okay) = sm->property_map(name); if(okay) { return displaySMProperty(*sm, pmap, TAG()); @@ -2003,7 +2003,7 @@ private: { Int32_map pmap; - std::tie(pmap, okay) = sm->property_map(name); + std::tie(pmap, okay) = sm->property_map(name); if(okay) { return displaySMProperty(*sm, pmap, TAG()); @@ -2021,7 +2021,7 @@ private: { Int64_map pmap; - std::tie(pmap, okay) = sm->property_map(name); + std::tie(pmap, okay) = sm->property_map(name); if(okay) { return displaySMProperty(*sm, pmap, TAG()); diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp index 24deb8dbc30..94c091b86e9 100644 --- a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_image_item.cpp @@ -549,9 +549,9 @@ template <> const char* whatType(float) { return "float"; } template <> const char* whatType(double) { return "double"; } template <> const char* whatType(char) { return "int8_t (char)"; } template <> const char* whatType(std::uint8_t) { return "uint8_t (unsigned char)"; } -template <> const char* whatType(boost::int16_t) { return "int16_t (short)"; } +template <> const char* whatType(std::int16_t) { return "int16_t (short)"; } template <> const char* whatType(std::uint16_t) { return "uint16_t (unsigned short)"; } -template <> const char* whatType(boost::int32_t) { return "int32_t (int)"; } +template <> const char* whatType(std::int32_t) { return "int32_t (int)"; } template <> const char* whatType(std::uint32_t) { return "uint32_t (unsigned int)"; } template diff --git a/Random_numbers/include/CGAL/Random_impl.h b/Random_numbers/include/CGAL/Random_impl.h index 89ca7057fe5..675ed05e814 100644 --- a/Random_numbers/include/CGAL/Random_impl.h +++ b/Random_numbers/include/CGAL/Random_impl.h @@ -40,7 +40,7 @@ Random() std::time( &s); seed = (unsigned int)s; // initialize random numbers generator - rng.seed(static_cast(seed)); + rng.seed(static_cast(seed)); random_value = get_int(0, 1<<15); } @@ -55,7 +55,7 @@ Random(internal::Random_print_seed) seed = (unsigned int)s; std::cerr << "CGAL::Random()::get_seed() = " << seed << std::endl; // initialize random numbers generator - rng.seed(static_cast(seed)); + rng.seed(static_cast(seed)); random_value = get_int(0, 1<<15); } @@ -65,7 +65,7 @@ Random( unsigned int seed) : val(0), seed(seed) { // initialize random numbers generator - rng.seed(static_cast(seed)); + rng.seed(static_cast(seed)); random_value = get_int(0, 1<<15); } diff --git a/Spatial_searching/include/CGAL/Kd_tree_node.h b/Spatial_searching/include/CGAL/Kd_tree_node.h index 242b1c9ccc4..c6af70495a2 100644 --- a/Spatial_searching/include/CGAL/Kd_tree_node.h +++ b/Spatial_searching/include/CGAL/Kd_tree_node.h @@ -435,7 +435,7 @@ namespace CGAL { private: // private variables for leaf nodes - boost::int32_t n; // denotes number of items in a leaf node + std::int32_t n; // denotes number of items in a leaf node iterator data; // iterator to data in leaf node @@ -503,7 +503,7 @@ namespace CGAL { private: // private variables for internal nodes - boost::int32_t cut_dim; + std::int32_t cut_dim; FT cut_val; Node_handle lower_ch, upper_ch; diff --git a/Stream_support/include/CGAL/IO/OFF/File_header_OFF_impl.h b/Stream_support/include/CGAL/IO/OFF/File_header_OFF_impl.h index 1ecff298f55..87994e60aa9 100644 --- a/Stream_support/include/CGAL/IO/OFF/File_header_OFF_impl.h +++ b/Stream_support/include/CGAL/IO/OFF/File_header_OFF_impl.h @@ -348,7 +348,7 @@ std::istream& operator>>( std::istream& in, File_header_OFF& h) { // Read remaining size value(s). int n_h; if ( h.binary()) { - boost::int32_t a, b, c; + std::int32_t a, b, c; I_Binary_read_big_endian_integer32( in, a); if ( h.n_dimensional()) { h.set_dimension( a); diff --git a/Stream_support/include/CGAL/IO/OFF/File_scanner_OFF.h b/Stream_support/include/CGAL/IO/OFF/File_scanner_OFF.h index 80629599818..8ec2d14334b 100644 --- a/Stream_support/include/CGAL/IO/OFF/File_scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/OFF/File_scanner_OFF.h @@ -656,7 +656,7 @@ public: if(has_colors()) { - boost::int32_t k; + std::int32_t k; I_Binary_read_big_endian_integer32(m_in, k); if(k<0 || k>4) { @@ -688,7 +688,7 @@ public: CGAL_assertion(current_facet < size_of_facets()); if(binary()) { - boost::int32_t i32; + std::int32_t i32; I_Binary_read_big_endian_integer32(m_in, i32); size = i32; } @@ -735,7 +735,7 @@ public: std::size_t current_facet) { if(binary()){ - boost::int32_t i32; + std::int32_t i32; I_Binary_read_big_endian_integer32(m_in, i32); index = i32; } @@ -793,7 +793,7 @@ public: // Take care of trailing information like color triples. if(binary()) { - boost::int32_t k; + std::int32_t k; I_Binary_read_big_endian_integer32(m_in, k); if(k<0 || k>4) { diff --git a/Stream_support/include/CGAL/IO/OFF/File_writer_OFF.h b/Stream_support/include/CGAL/IO/OFF/File_writer_OFF.h index 91860254f47..d608a7e38f4 100644 --- a/Stream_support/include/CGAL/IO/OFF/File_writer_OFF.h +++ b/Stream_support/include/CGAL/IO/OFF/File_writer_OFF.h @@ -129,7 +129,7 @@ public: void write_facet_begin(std::size_t no) { if(m_header.binary()) - I_Binary_write_big_endian_integer32(out(), static_cast(no)); + I_Binary_write_big_endian_integer32(out(), static_cast(no)); else out() << no << ' '; } @@ -137,7 +137,7 @@ public: void write_facet_vertex_index(std::size_t index) { if(m_header.binary()) - I_Binary_write_big_endian_integer32(out(), static_cast(index)); + I_Binary_write_big_endian_integer32(out(), static_cast(index)); else out() << ' ' << index; } diff --git a/Stream_support/include/CGAL/IO/PLY.h b/Stream_support/include/CGAL/IO/PLY.h index c9623ac455d..7f72b37a3f5 100644 --- a/Stream_support/include/CGAL/IO/PLY.h +++ b/Stream_support/include/CGAL/IO/PLY.h @@ -131,17 +131,17 @@ bool read_PLY(std::istream& is, } else if(element.name() == "face" || element.name() == "faces") { - if(element.has_property >("vertex_indices")) + if(element.has_property >("vertex_indices")) { - internal::read_PLY_faces(is, element, polygons, fc_out, "vertex_indices"); + internal::read_PLY_faces(is, element, polygons, fc_out, "vertex_indices"); } else if(element.has_property >("vertex_indices")) { internal::read_PLY_faces(is, element, polygons, fc_out, "vertex_indices"); } - else if(element.has_property >("vertex_index")) + else if(element.has_property >("vertex_index")) { - internal::read_PLY_faces(is, element, polygons, fc_out, "vertex_index"); + internal::read_PLY_faces(is, element, polygons, fc_out, "vertex_index"); } else if(element.has_property >("vertex_index")) { diff --git a/Stream_support/include/CGAL/IO/PLY/PLY_reader.h b/Stream_support/include/CGAL/IO/PLY/PLY_reader.h index cd007c25618..a4a50bd36c8 100644 --- a/Stream_support/include/CGAL/IO/PLY/PLY_reader.h +++ b/Stream_support/include/CGAL/IO/PLY/PLY_reader.h @@ -38,11 +38,11 @@ #define TRY_TO_GENERATE_LIST_PROPERTY(STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE) \ TRY_TO_GENERATE_SIZED_LIST_PROPERTY("uchar", "uint8", std::uint8_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ - else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("char", "int8", boost::int8_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ + else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("char", "int8", std::int8_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("ushort", "uint16", std::uint16_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ - else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("short", "int16", boost::int16_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ + else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("short", "int16", std::int16_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("uint", "uint32", std::uint32_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE); \ - else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("int", "int32", boost::int32_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE) + else TRY_TO_GENERATE_SIZED_LIST_PROPERTY("int", "int32", std::int32_t, STD_INDEX_TYPE, T_INDEX_TYPE, INDEX_TYPE) namespace CGAL { @@ -529,22 +529,22 @@ public: return false; } - TRY_TO_GENERATE_LIST_PROPERTY("char", "int8", boost::int8_t); + TRY_TO_GENERATE_LIST_PROPERTY("char", "int8", std::int8_t); else TRY_TO_GENERATE_LIST_PROPERTY("uchar", "uint8", std::uint8_t); - else TRY_TO_GENERATE_LIST_PROPERTY("short", "int16", boost::int16_t); + else TRY_TO_GENERATE_LIST_PROPERTY("short", "int16", std::int16_t); else TRY_TO_GENERATE_LIST_PROPERTY("ushort", "uint16", std::uint16_t); - else TRY_TO_GENERATE_LIST_PROPERTY("int", "int32", boost::int32_t); + else TRY_TO_GENERATE_LIST_PROPERTY("int", "int32", std::int32_t); else TRY_TO_GENERATE_LIST_PROPERTY("uint", "uint32", std::uint32_t); else TRY_TO_GENERATE_LIST_PROPERTY("float", "float32", float); else TRY_TO_GENERATE_LIST_PROPERTY("double", "float64", double); } else { - TRY_TO_GENERATE_PROPERTY("char", "int8", boost::int8_t); + TRY_TO_GENERATE_PROPERTY("char", "int8", std::int8_t); else TRY_TO_GENERATE_PROPERTY("uchar", "uint8", std::uint8_t); - else TRY_TO_GENERATE_PROPERTY("short", "int16", boost::int16_t); + else TRY_TO_GENERATE_PROPERTY("short", "int16", std::int16_t); else TRY_TO_GENERATE_PROPERTY("ushort", "uint16", std::uint16_t); - else TRY_TO_GENERATE_PROPERTY("int", "int32", boost::int32_t); + else TRY_TO_GENERATE_PROPERTY("int", "int32", std::int32_t); else TRY_TO_GENERATE_PROPERTY("uint", "uint32", std::uint32_t); else TRY_TO_GENERATE_PROPERTY("float", "float32", float); else TRY_TO_GENERATE_PROPERTY("double", "float64", double); diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h index dac77f788dd..7bf9dd2e8fc 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h @@ -145,10 +145,10 @@ public: const std::string& name = property->name(); if(name == "vertex_indices" || name == "vertex_index") { - CGAL_assertion(dynamic_cast*>(property) + CGAL_assertion(dynamic_cast*>(property) || dynamic_cast*>(property)); m_index_tag = name; - m_use_int32_t = dynamic_cast*>(property); + m_use_int32_t = dynamic_cast*>(property); return true; } if(name == "red" || @@ -218,25 +218,25 @@ public: const std::string& name = property->name(); - if(dynamic_cast*>(property)) + if(dynamic_cast*>(property)) { - properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); + properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); } else if(dynamic_cast*>(property)) { properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); } - else if(dynamic_cast*>(property)) + else if(dynamic_cast*>(property)) { - properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); + properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); } else if(dynamic_cast*>(property)) { properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); } - else if(dynamic_cast*>(property)) + else if(dynamic_cast*>(property)) { - properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); + properties.push_back(new PLY_property_to_surface_mesh_property(m_mesh, name)); } else if(dynamic_cast*>(property)) { @@ -314,7 +314,7 @@ public: Face_index fi = m_mesh.null_face(); if(m_use_int32_t) - process_line(element, fi); + process_line(element, fi); else process_line(element, fi); @@ -368,7 +368,7 @@ public: Edge_index ei = m_mesh.null_edge(); if(m_use_int32_t) - process_line(element, ei); + process_line(element, ei); else process_line(element, ei); @@ -401,7 +401,7 @@ public: Halfedge_index hi = m_mesh.null_halfedge(); if(m_use_int32_t) - process_line(element, hi); + process_line(element, hi); else process_line(element, hi); @@ -640,13 +640,13 @@ void fill_header(std::ostream& os, const Surface_mesh& sm, const CGAL_NP_CLASS& np = parameters::default_values()) { typedef Surface_mesh SMesh; - typedef typename SMesh::template Property_map Int8_map; + typedef typename SMesh::template Property_map Int8_map; typedef typename SMesh::template Property_map Uint8_map; - typedef typename SMesh::template Property_map Int16_map; + typedef typename SMesh::template Property_map Int16_map; typedef typename SMesh::template Property_map Uint16_map; - typedef typename SMesh::template Property_map Int32_map; + typedef typename SMesh::template Property_map Int32_map; typedef typename SMesh::template Property_map Uint32_map; - typedef typename SMesh::template Property_map Int64_map; + typedef typename SMesh::template Property_map Int64_map; typedef typename SMesh::template Property_map Uint64_map; typedef typename SMesh::template Property_map Float_map; typedef typename SMesh::template Property_map Double_map; @@ -711,7 +711,7 @@ void fill_header(std::ostream& os, const Surface_mesh& sm, bool okay = false; { Int8_map pmap; - boost::tie(pmap, okay) = sm.template property_map(prop[i]); + boost::tie(pmap, okay) = sm.template property_map(prop[i]); if(okay) { os << "property char " << name << std::endl; @@ -731,7 +731,7 @@ void fill_header(std::ostream& os, const Surface_mesh& sm, } { Int16_map pmap; - boost::tie(pmap, okay) = sm.template property_map(prop[i]); + boost::tie(pmap, okay) = sm.template property_map(prop[i]); if(okay) { os << "property short " << name << std::endl; @@ -751,7 +751,7 @@ void fill_header(std::ostream& os, const Surface_mesh& sm, } { Int32_map pmap; - boost::tie(pmap, okay) = sm.template property_map(prop[i]); + boost::tie(pmap, okay) = sm.template property_map(prop[i]); if(okay) { os << "property int " << name << std::endl; @@ -771,11 +771,11 @@ void fill_header(std::ostream& os, const Surface_mesh& sm, } { Int64_map pmap; - boost::tie(pmap, okay) = sm.template property_map(prop[i]); + boost::tie(pmap, okay) = sm.template property_map(prop[i]); if(okay) { os << "property int " << name << std::endl; - printers.push_back(new internal::Simple_property_printer(pmap)); + printers.push_back(new internal::Simple_property_printer(pmap)); continue; } } diff --git a/Triangulation_3/test/Triangulation_3/test_regular_remove_3.cpp b/Triangulation_3/test/Triangulation_3/test_regular_remove_3.cpp index f37bb096413..9252598776c 100644 --- a/Triangulation_3/test/Triangulation_3/test_regular_remove_3.cpp +++ b/Triangulation_3/test/Triangulation_3/test_regular_remove_3.cpp @@ -329,7 +329,7 @@ int main(int argc, char **argv) } // Hardcoded seeds so that the test-suite is deterministic. - boost::int32_t seed0 = 42, seed1 = 43, seed2 = 42, seed3 = 42; + std::int32_t seed0 = 42, seed1 = 43, seed2 = 42, seed3 = 42; // You can also pass seeds on the command line. if (argc > 1) { std::istringstream iss(argv[1]); iss >>seed0; }