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

Fix warnings

This commit is contained in:
Clement Jamin 2014-09-22 15:20:46 +02:00
parent 8835be2374
commit 2974822d30
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -342,7 +342,7 @@ public:
private:
// Some internal types to shorten notation
using typename Base::Coaffine_orientation_d;
typedef typename Base::Coaffine_orientation_d Coaffine_orientation_d;
using Base::flat_orientation_;
typedef Conflict_predicate<Coaffine_orientation_d, Side_of_oriented_subsphere_d>
Conflict_pred_in_subspace;
@ -716,7 +716,7 @@ Delaunay_triangulation<DCTraits, TDS>
template< typename DCTraits, typename TDS >
typename Delaunay_triangulation<DCTraits, TDS>::Vertex_handle
Delaunay_triangulation<DCTraits, TDS>
::insert(const Point & p, const Locate_type lt, const Face & f, const Facet & ft, const Full_cell_handle s)
::insert(const Point & p, const Locate_type lt, const Face & f, const Facet &, const Full_cell_handle s)
{
switch( lt )
{

2
Triangulation/include/CGAL/Triangulation.h
View File

@ -1181,7 +1181,7 @@ Triangulation<TT, TDS>
}
template < class TT, class TDS >
bool Triangulation<TT, TDS>::are_incident_full_cells_valid(Vertex_const_handle v, bool verbose, int level) const
bool Triangulation<TT, TDS>::are_incident_full_cells_valid(Vertex_const_handle v, bool verbose, int) const
{
if( current_dimension() <= 0 )
return true;

22
Triangulation/include/CGAL/Triangulation_data_structure.h
View File

@ -609,7 +609,7 @@ public:
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INPUT / OUTPUT
std::istream & read_full_cells(std::istream &, const std::vector<Vertex_handle> &);
std::ostream & write_full_cells(std::ostream &, std::map<Vertex_const_handle, int> &) const;
std::ostream & write_full_cells(std::ostream &, std::map<Vertex_const_handle, std::size_t> &) const;
}; // end of ``declaration/definition'' of Triangulation_data_structure<...>
@ -1299,7 +1299,7 @@ void Triangulation_data_structure<Dim, Vb, Fcb>
++v1;
}
}
for( int i = 0; i < edges.size(); ++i )
for( std::size_t i = 0; i < edges.size(); ++i )
{
os << std::endl << edges[i].size();
for( std::set<int>::const_iterator nit = edges[i].begin();
@ -1316,7 +1316,7 @@ std::istream &
Triangulation_data_structure<Dimen, Vb, Fcb>
::read_full_cells(std::istream & is, const std::vector<Vertex_handle> & vertices)
{
size_t m; // number of full_cells
std::size_t m; // number of full_cells
int index;
const int cd = current_dimension();
if( is_ascii(is) )
@ -1327,7 +1327,7 @@ Triangulation_data_structure<Dimen, Vb, Fcb>
std::vector<Full_cell_handle> full_cells;
full_cells.reserve(m);
// read the vertices of each full_cell
size_t i = 0;
std::size_t i = 0;
while( i < m )
{
Full_cell_handle s = new_full_cell();
@ -1392,11 +1392,11 @@ Triangulation_data_structure<Dimen, Vb, Fcb>
template<class Dimen, class Vb, class Fcb>
std::ostream &
Triangulation_data_structure<Dimen, Vb, Fcb>
::write_full_cells(std::ostream & os, std::map<Vertex_const_handle, int> & index_of_vertex) const
::write_full_cells(std::ostream & os, std::map<Vertex_const_handle, std::size_t> & index_of_vertex) const
{
std::map<Full_cell_const_handle, int> index_of_full_cell;
size_t m = number_of_full_cells();
std::size_t m = number_of_full_cells();
if( is_ascii(os) )
os << std::endl << m;
@ -1462,7 +1462,7 @@ operator>>(std::istream & is, Triangulation_data_structure<Dimen, Vb, Fcb> & tr)
typedef typename TDS::Vertex_handle Vertex_handle;
// read current dimension and number of vertices
size_t n;
std::size_t n;
int cd;
if( is_ascii(is) )
is >> cd >> n;
@ -1484,7 +1484,7 @@ operator>>(std::istream & is, Triangulation_data_structure<Dimen, Vb, Fcb> & tr)
vertices.resize(n);
// read the vertices:
size_t i(0);
std::size_t i(0);
while( i < n )
{
vertices[i] = tr.new_vertex();
@ -1513,7 +1513,7 @@ operator<<(std::ostream & os, const Triangulation_data_structure<Dimen, Vb, Fcb>
typedef typename TDS::Vertex_const_iterator Vertex_iterator;
// outputs dimension and number of vertices
size_t n = tr.number_of_vertices();
std::size_t n = tr.number_of_vertices();
if( is_ascii(os) )
os << tr.current_dimension() << std::endl << n;
else
@ -1526,8 +1526,8 @@ operator<<(std::ostream & os, const Triangulation_data_structure<Dimen, Vb, Fcb>
return os;
// write the vertices
std::map<Vertex_handle, int> index_of_vertex;
int i = 0;
std::map<Vertex_handle, std::size_t> index_of_vertex;
std::size_t i = 0;
for( Vertex_iterator it = tr.vertices_begin(); it != tr.vertices_end(); ++it, ++i )
{
os << *it; // write the vertex

6
Triangulation/include/CGAL/Triangulation_ds_full_cell.h
View File

@ -210,7 +210,7 @@ public:
void* for_compact_container() const { return combinatorics_.for_compact_container(); }
void* & for_compact_container() { return combinatorics_.for_compact_container(); }
bool is_valid(bool verbose = false, int level = 0) const /* Concept */
bool is_valid(bool verbose = false, int = 0) const /* Concept */
{
const int d = maximal_dimension();
int i(0);
@ -261,7 +261,7 @@ private:
template < typename TDS, typename SSP >
std::ostream &
operator<<(std::ostream & O, const Triangulation_ds_full_cell<TDS,SSP> & s) /* Concept */
operator<<(std::ostream & O, const Triangulation_ds_full_cell<TDS,SSP> &) /* Concept */
{
/*if( is_ascii(O) )
{
@ -273,7 +273,7 @@ operator<<(std::ostream & O, const Triangulation_ds_full_cell<TDS,SSP> & s) /* C
template < typename TDS, typename SSP >
std::istream &
operator>>(std::istream & I, Triangulation_ds_full_cell<TDS,SSP> & s) /* Concept */
operator>>(std::istream & I, Triangulation_ds_full_cell<TDS,SSP> &) /* Concept */
{
/*if( is_ascii(I) )
{}

8
Triangulation/include/CGAL/Triangulation_ds_vertex.h
View File

@ -47,7 +47,7 @@ public:
protected: // DATA MEMBERS
Full_cell_handle full_cell_; // A handle to an incident full_cell
public:
public:
// Constructs a vertex with incident full_cell 's'
Triangulation_ds_vertex(Full_cell_handle s) : full_cell_(s) /* Concept */
{
@ -61,7 +61,7 @@ public:
/// Set 's' as an incident full_cell
void set_full_cell(Full_cell_handle s) /* Concept */
{
CGAL_precondition( Full_cell_handle() != s );
CGAL_precondition( Full_cell_handle() != s );
full_cell_ = s;
}
@ -115,7 +115,7 @@ public: // FOR MEMORY MANAGEMENT
template < class TDS >
std::istream &
operator>>(std::istream & is, Triangulation_ds_vertex<TDS> & v) /* Concept */
operator>>(std::istream & is, Triangulation_ds_vertex<TDS> &) /* Concept */
{
/*if( is_ascii(is) )
{}
@ -125,7 +125,7 @@ operator>>(std::istream & is, Triangulation_ds_vertex<TDS> & v) /* Concept */
template< class TDS >
std::ostream &
operator<<(std::ostream & os, const Triangulation_ds_vertex<TDS> & v) /* Concept */
operator<<(std::ostream & os, const Triangulation_ds_vertex<TDS> &) /* Concept */
{
/*if( is_ascii(os) )
{

2
Triangulation/include/CGAL/Triangulation_full_cell.h
View File

@ -128,7 +128,7 @@ operator>>(std::istream & is, No_full_cell_data &)
}
std::ostream &
operator<<(std::ostream & os, const No_full_cell_data & nd)
operator<<(std::ostream & os, const No_full_cell_data &)
{
return os;
}

2
Triangulation/include/CGAL/Triangulation_vertex.h
View File

@ -100,7 +100,7 @@ operator>>(std::istream & is, No_vertex_data &)
}
std::ostream &
operator<<(std::ostream & os, const No_vertex_data & nd)
operator<<(std::ostream & os, const No_vertex_data &)
{
return os;
}