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

fix signed <-> unsigned comparison warning on gcc.

This commit is contained in:
Michael Hoffmann 1998-11-26 16:13:46 +00:00
parent 32c967cb7b
commit decb896299
12 changed files with 4 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/Matrix_search/include/CGAL/All_furthest_neighbors_traits_2.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_ALL_FURTHEST_NEIGHBORS_TRAITS_2_H)
#define CGAL_ALL_FURTHEST_NEIGHBORS_TRAITS_2_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
//!!! this should go into function_objects.h
#ifndef CGAL_PROTECT_FUNCTION_H
#include <function.h>

2
Packages/Matrix_search/include/CGAL/Cartesian_matrix.h
View File

@ -30,9 +30,7 @@
#ifndef CGAL_BASIC_H
#include <CGAL/basic.h>
#endif // CGAL_BASIC_H
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
template < class Operation,
class RandomAccessIC_row,

2
Packages/Matrix_search/include/CGAL/Dynamic_matrix.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_DYNAMIC_MATRIX_H)
#define CGAL_DYNAMIC_MATRIX_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
template < class Matrix >
class CGAL_Dynamic_matrix

4
Packages/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_EXTREMAL_POLYGON_TRAITS_2_H)
#define CGAL_EXTREMAL_POLYGON_TRAITS_2_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_SQUARED_DISTANCE_2_H
#include <CGAL/squared_distance_2.h>
#endif // CGAL_SQUARED_DISTANCE_2_H
@ -190,9 +188,7 @@ public:
};
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_PROTECT_MATH_H
#include <math.h>
#define CGAL_PROTECT_MATH_H

2
Packages/Matrix_search/include/CGAL/Iso_square_static_2.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_ISO_SQUARE_STATIC_2_H)
#define CGAL_ISO_SQUARE_STATIC_2_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
// class CGAL__Iso_square_static_2 represents a square with center and radius.
// all objects have the same radius ==> radius is a static member

6
Packages/Matrix_search/include/CGAL/Pierce_rectangles_2_traits.h
View File

@ -27,15 +27,9 @@
#if ! (CGAL_PIERCE_RECTANGLES_2_TRAITS_H)
#define CGAL_PIERCE_RECTANGLES_2_TRAITS_H 1
#ifndef CGAL_POINT_2_H
#include <CGAL/Point_2.h>
#endif // CGAL_POINT_2_H
#ifndef CGAL_ISO_RECTANGLE_2_H
#include <CGAL/Iso_rectangle_2.h>
#endif // CGAL_ISO_RECTANGLE_2_H
#ifndef CGAL_ISO_SQUARE_STATIC_2_H
#include <CGAL/Iso_square_static_2.h>
#endif // CGAL_ISO_SQUARE_STATIC_2_H
template < class _R >
struct CGAL_Piercing_traits_cartesian {

2
Packages/Matrix_search/include/CGAL/Transform_iterator.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_TRANSFORM_ITERATOR_H)
#define CGAL_TRANSFORM_ITERATOR_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_CIRCULATOR_BASES_H
#include <CGAL/circulator_bases.h>
#endif // CGAL_CIRCULATOR_BASES_H

2
Packages/Matrix_search/include/CGAL/all_furthest_neighbors_2.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_ALL_FURTHEST_NEIGHBORS_2_H)
#define CGAL_ALL_FURTHEST_NEIGHBORS_2_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifdef CGAL_REP_CLASS_DEFINED
#ifndef CGAL_ALL_FURTHEST_NEIGHBORS_TRAITS_2_H

2
Packages/Matrix_search/include/CGAL/monotone_matrix_search.h
View File

@ -27,9 +27,7 @@
#if ! (CGAL_MONOTONE_MATRIX_SEARCH_H)
#define CGAL_MONOTONE_MATRIX_SEARCH_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_PROTECT_VECTOR_H
#include <vector.h>
#define CGAL_PROTECT_VECTOR_H

26
Packages/Matrix_search/include/CGAL/pierce_rectangles_2.h
View File

@ -27,33 +27,15 @@
#if ! (CGAL_PIERCE_RECTANGLES_2_H)
#define CGAL_PIERCE_RECTANGLES_2_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_CIRCULATOR_H
#include <CGAL/circulator.h>
#endif // CGAL_CIRCULATOR_H
#ifndef CGAL_FUNCTION_OBJECTS_H
#include <CGAL/function_objects.h>
#endif // CGAL_FUNCTION_OBJECTS_H
#ifndef CGAL_TRANSFORM_ITERATOR_H
#include <CGAL/Transform_iterator.h>
#endif // CGAL_TRANSFORM_ITERATOR_H
#ifndef CGAL_PROTECT_ALGO_H
#include <algo.h>
#define CGAL_PROTECT_ALGO_H
#endif // CGAL_PROTECT_ALGO_H
#ifndef CGAL_PROTECT_VECTOR_H
#include <vector.h>
#define CGAL_PROTECT_VECTOR_H
#endif // CGAL_PROTECT_VECTOR_H
#ifdef CGAL_PCENTER_WINDOW_TRACE
#ifndef CGAL_IO_WINDOW_STREAM_H
#include <CGAL/IO/Window_stream.h>
#endif // CGAL_IO_WINDOW_STREAM_H
#ifndef CGAL_IO_OSTREAM_ITERATOR_H
#include <CGAL/IO/Ostream_iterator.h>
#endif // CGAL_IO_OSTREAM_ITERATOR_H
#endif // CGAL_PCENTER_WINDOW_TRACE
//!!! to function_objects.h
@ -807,9 +789,7 @@ CGAL__Rectangle_partition(
} // Rectangle_partition( f, l, d)
#ifdef CGAL_REP_CLASS_DEFINED
#ifndef CGAL_PIERCE_RECTANGLES_2_TRAITS_H
#include <CGAL/Pierce_rectangles_2_traits.h>
#endif // CGAL_PIERCE_RECTANGLES_2_TRAITS_H
#endif // CGAL_REP_CLASS_DEFINED
template < class RandomAccessIC,
@ -994,6 +974,7 @@ CGAL_three_pierce_rectangles(
// define container to store disjoint rectangles:
// typedef vector< Iso_rectangle_2 > Rectangle_cont;
typedef vector< Iso_rectangle_2 > Rectangle_cont;
typedef Rectangle_cont::size_type size_type;
typedef Rectangle_cont::iterator Rectangle_iterator;
Rectangle_cont disjoint;
disjoint.reserve( number_of_points);
@ -1064,7 +1045,7 @@ CGAL_three_pierce_rectangles(
if ( ok) {
// does any rectangle contain the corner?
if ( disjoint.size() < number_of_points)
if ( disjoint.size() < CGAL_static_cast( size_type, number_of_points))
*o++ = d.vertex( k);
return o;
} // if ( ok)
@ -1141,6 +1122,7 @@ CGAL_four_pierce_rectangles(
// define container to store disjoint rectangles:
// typedef vector< Iso_rectangle_2 > Rectangle_cont;
typedef vector< Iso_rectangle_2 > Rectangle_cont;
typedef Rectangle_cont::size_type size_type;
typedef Rectangle_cont::iterator Rectangle_iterator;
Rectangle_cont disjoint;
disjoint.reserve( number_of_points);
@ -1211,7 +1193,7 @@ CGAL_four_pierce_rectangles(
if ( ok) {
// does any rectangle contain the corner?
if ( disjoint.size() < number_of_points)
if ( disjoint.size() < CGAL_static_cast( size_type, number_of_points))
*o++ = d.vertex( k);
return o;
} // if ( ok)

13
Packages/Matrix_search/include/CGAL/rectangular_p_center_2.h
View File

@ -27,28 +27,15 @@
#if ! (CGAL_RECTANGULAR_P_CENTER_2_H)
#define CGAL_RECTANGULAR_P_CENTER_2_H 1
#ifndef CGAL_PIERCE_RECTANGLES_2_H
#include <CGAL/pierce_rectangles_2.h>
#endif // CGAL_PIERCE_RECTANGLES_2_H
#ifndef CGAL_FUNCTION_OBJECTS_H
#include <CGAL/function_objects.h>
#endif // CGAL_FUNCTION_OBJECTS_H
#ifndef CGAL_SORTED_MATRIX_SEARCH_H
#include <CGAL/sorted_matrix_search.h>
#endif // CGAL_SORTED_MATRIX_SEARCH_H
#ifndef CGAL_PROTECT_ALGO_H
#include <algo.h>
#define CGAL_PROTECT_ALGO_H
#endif // CGAL_PROTECT_ALGO_H
#ifdef CGAL_REP_CLASS_DEFINED
#ifndef CGAL_RECTANGULAR_P_CENTER_2_TRAITS_H
#include <CGAL/rectangular_p_center_2_traits.h>
#endif // CGAL_RECTANGULAR_P_CENTER_2_TRAITS_H
#endif // CGAL_REP_CLASS_DEFINED
#ifndef CGAL_CARTESIAN_MATRIX_H
#include <CGAL/Cartesian_matrix.h>
#endif // CGAL_CARTESIAN_MATRIX_H
template < class Operation,
class RandomAccessIC_row,

7
Packages/Matrix_search/include/CGAL/rectangular_p_center_2_traits.h
View File

@ -27,16 +27,9 @@
#if ! (CGAL_RECTANGULAR_P_CENTER_2_TRAITS_H)
#define CGAL_RECTANGULAR_P_CENTER_2_TRAITS_H 1
#ifndef CGAL_OPTIMISATION_ASSERTIONS_H
#include <CGAL/optimisation_assertions.h>
#endif // CGAL_OPTIMISATION_ASSERTIONS_H
#ifndef CGAL_ISO_RECTANGLE_2_H
#include <CGAL/Iso_rectangle_2.h>
#endif // CGAL_ISO_RECTANGLE_2_H
#ifndef CGAL_PROTECT_VECTOR_H
#include <vector.h>
#define CGAL_PROTECT_VECTOR_H
#endif // CGAL_PROTECT_VECTOR_H
#if !defined(CGAL_CFG_NO_ITERATOR_TRAITS) && \
!defined(CGAL_CFG_MATCHING_BUG_2)