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

Merge branch 'master' into BGL-doc_improvement-GF

This commit is contained in:
Mael Rouxel-Labbé 2018-02-19 15:41:45 +01:00 committed by GitHub
parent 6e5a09207b 47d1840b29
commit dafdafa0bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
514 changed files with 2566 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/AABB_primitive.h>
#include <CGAL/boost/graph/property_maps.h>
@ -178,5 +179,7 @@ public:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_FACE_GRAPH_TRIANGLE_PRIMITIVE_H

2
AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/AABB_primitive.h>
#include <CGAL/boost/graph/property_maps.h>
@ -190,6 +191,7 @@ public:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_HALFEDGE_GRAPH_SEGMENT_PRIMITIVE_H

2
AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_segment_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_halfedge_graph_segment_primitive.h>"
@ -162,5 +163,6 @@ namespace CGAL {
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_POLYHEDRON_SEGMENT_PRIMITIVE_H_

2
AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_triangle_primitive.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_face_graph_triangle_primitive.h>"
@ -158,5 +159,6 @@ namespace CGAL {
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_POLYHEDRON_TRIANGLE_PRIMITIVE_H_

2
AABB_tree/include/CGAL/AABB_primitive.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h>
#include <CGAL/property_map.h>
@ -231,6 +232,7 @@ public:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_PRIMITIVE_H

2
AABB_tree/include/CGAL/AABB_segment_primitive.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/AABB_primitive.h>
#include <CGAL/result_of.h>
@ -102,6 +103,7 @@ public:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_SEGMENT_PRIMITIVE_H_

4
AABB_tree/include/CGAL/AABB_traits.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Bbox_3.h>
#include <CGAL/Default.h>
#include <CGAL/intersections.h>
@ -541,4 +543,6 @@ private:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_TRAITS_H_

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

@ -24,6 +24,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <vector>
#include <iterator>
@ -1282,6 +1283,7 @@ public:
#include <CGAL/internal/AABB_tree/AABB_ray_intersection.h>
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_TREE_H

2
AABB_tree/include/CGAL/AABB_triangle_primitive.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/AABB_primitive.h>
#include <CGAL/result_of.h>
@ -102,6 +103,7 @@ public:
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_AABB_TRIANGLE_PRIMITIVE_H_

2
AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/AABB_tree.h>
#include <CGAL/disable_warnings.h>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_same.hpp>
@ -119,5 +120,6 @@ namespace CGAL {
} // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // AABB_TRIANGULATION_3_TRIANGLE_PRIMITIVE_H_

5
AABB_tree/test/AABB_tree/AABB_test_util.h
View File

@ -30,6 +30,9 @@
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/internal/AABB_tree/Primitive_helper.h>
#include <CGAL/use.h>
@ -870,3 +873,5 @@ private:
mutable double m_naive_time;
mutable double m_tree_time;
};
#include <CGAL/enable_warnings.h>

1
Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
View File

@ -10,6 +10,7 @@
#include <CGAL/Triangulation_vertex_base_with_info_3.h>
#include <CGAL/Advancing_front_surface_reconstruction.h>
#include <CGAL/IO/read_xyz_points.h>
#include <CGAL/disable_warnings.h>
#include <boost/lexical_cast.hpp>

1
Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_surface_mesh.cpp
View File

@ -5,6 +5,7 @@
#include <CGAL/Advancing_front_surface_reconstruction.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/array.h>
#include <CGAL/disable_warnings.h>
typedef CGAL::cpp11::array<std::size_t,3> Facet;

3
Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Advancing_front_surface_reconstruction.h>
#include <CGAL/disable_warnings.h>
// In order to activate lazy evaluation:
// #define LAZY
@ -2650,4 +2651,6 @@ namespace CGAL {
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_H

1
Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/polyhedron.cpp
View File

@ -6,7 +6,6 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Advancing_front_surface_reconstruction.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
typedef CGAL::Simple_cartesian<double> K;
typedef K::Point_3 Point_3;

4
Algebraic_foundations/include/CGAL/Needs_parens_as_product.h
View File

@ -24,6 +24,8 @@
#ifndef CGAL_NEEDS_PARENTHESES_AS_PRODUCT_H
#define CGAL_NEEDS_PARENTHESES_AS_PRODUCT_H
#include <CGAL/disable_warnings.h>
#include <CGAL/IO/io.h>
namespace CGAL {
@ -100,4 +102,6 @@ template <> struct Needs_parens_as_product<long double>{
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif //CGAL_NEEDS_PARENTHESES_AS_PRODUCT_H

6
Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
View File

@ -43,9 +43,12 @@
#include <CGAL/Testsuite/use.h>
#ifndef CGAL_TEST_ALGEBRAIC_STRUCTURE_H
#define CGAL_TEST_ALGEBRAIC_STRUCTURE_H
#include <CGAL/disable_warnings.h>
// checks the result type of a functor
template <typename AdaptableFunctor, typename ResultType>
void check_result_type(AdaptableFunctor, ResultType){
@ -649,6 +652,7 @@ template<class AS , class Sqrt>
class Test_sqrt {
public:
void operator() (const Sqrt& sqrt) {
CGAL_USE(sqrt);
typedef typename Sqrt::argument_type Argument_type;
typedef typename Sqrt::result_type Result_type;
CGAL_USE_TYPE(Argument_type);
@ -952,4 +956,6 @@ void test_algebraic_structure( const AS & a, const AS & b, const AS & c) {
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_TEST_ALGEBRAIC_STRUCTURE_H

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
View File

@ -549,7 +549,7 @@ public:
typename std::vector< Algebraic_real_1>::iterator>
it_pair = std::equal_range(roots.begin(),roots.end(),y);
CGAL_assertion(std::distance(it_pair.first,it_pair.second)==1);
int index = std::distance(roots.begin(),it_pair.first);
int index = static_cast<int>(std::distance(roots.begin(),it_pair.first));
int degree = CGAL::degree(y_pol);
std::vector<std::pair<CGAL::Exponent_vector,Coefficient> > coeffs;
@ -2504,7 +2504,7 @@ public:
std::vector<std::pair<Algebraic_real_2,Multiplicity_type> > roots;
_m_kernel->solve_2_object()(f,g,std::back_inserter(roots));
return roots.size();
return static_cast<size_type>(roots.size());
}
protected:

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_quadratic_refinement_rep_bfi.h
View File

@ -28,6 +28,8 @@
#ifndef CGAL_ALGEBRAIC_REAL_QUADRATIC_REFINEMENT_REP_BFI_H
#define CGAL_ALGEBRAIC_REAL_QUADRATIC_REFINEMENT_REP_BFI_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Algebraic_kernel_d/Algebraic_real_rep.h>
@ -505,4 +507,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif //CGAL_ALGEBRAIC_REAL_QUADRATIC_REFINEMENT_REP_H

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h
View File

@ -27,6 +27,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
#define CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Polynomial_type_generator.h>
#include <CGAL/Polynomial_traits_d.h>
@ -524,4 +526,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H

3
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_coefficient_kernel_at_alpha.h
View File

@ -25,6 +25,8 @@
namespace CGAL {
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Arithmetic_kernel.h>
@ -226,5 +228,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_BITSTREAM_COEFFICIENT_KERNEL_AT_ALPHA_H

3
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h
View File

@ -24,6 +24,7 @@
#ifndef CGAL_GENERIC_DESCARTES
#define CGAL_GENERIC_DESCARTES 1
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Polynomial.h>
@ -1454,4 +1455,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

10
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h
View File

@ -31,6 +31,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_H
#define CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_H
#include <CGAL/disable_warnings.h>
#include <vector>
#include <list>
#include <utility>
@ -1507,7 +1509,7 @@ long Fujiwara_root_bound_log(
RandomAccessIterator first, RandomAccessIterator beyond,
LowerBoundLog2Abs lblog2, UpperBoundLog2AbsApproximator ublog2apx
) {
int n = beyond - first - 1; // degree
std::ptrdiff_t n = beyond - first - 1; // degree
if (n < 1) return 0;
long lblog2_lcoeff = lblog2(*(beyond - 1));
@ -1517,7 +1519,7 @@ long Fujiwara_root_bound_log(
std::vector<QE*> heap(n); // heap is built from pointers to them
for (int i = 0; i < n; ++i) {
QE& entry = entries[i];
entry.n_minus_i = n - i;
entry.n_minus_i = static_cast<int>(n - i);
entry.is_tight = ublog2apx.initial_upper_bound(
*(first + i), entry.ub_log2_qi, entry.is_certainly_zero
);
@ -1531,7 +1533,7 @@ long Fujiwara_root_bound_log(
while (!heap[0]->is_tight) {
std::pop_heap(heap.begin(), heap.end(), less);
QE& popped = **(heap.end() - 1);
int i = n - popped.n_minus_i;
std::ptrdiff_t i = n - popped.n_minus_i;
CGAL_assertion(i >= 0 && i < n);
CGAL_assertion(&popped == &(entries[i]));
popped.is_tight = ublog2apx.improve_upper_bound(
@ -1569,6 +1571,8 @@ long Fujiwara_root_bound_log(
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_H
// EOF

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h
View File

@ -23,6 +23,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_TRAITS_H
#define CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_TRAITS_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Arithmetic_kernel.h>
#include <CGAL/Algebraic_kernel_d/Real_embeddable_extension.h>
@ -441,4 +443,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_BITSTREAM_DESCARTES_RNDL_TREE_TRAITS_H

19
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_analysis_2.h
View File

@ -24,6 +24,8 @@
#ifndef CGAL_ALGEBRAIC_CURVE_KERNEL_CURVE_ANALYSIS_2_ALCIX_H
#define CGAL_ALGEBRAIC_CURVE_KERNEL_CURVE_ANALYSIS_2_ALCIX_H
#include <CGAL/disable_warnings.h>
#include <vector>
#include <set>
#include <map>
@ -64,12 +66,6 @@
#endif
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4290)
#endif
namespace CGAL {
template<typename AlgebraicKernelWithAnalysis_2,
@ -693,14 +689,14 @@ public:
#endif
CGAL_precondition(has_defining_polynomial());
typename Rep::Val_functor xval;
i = std::lower_bound(
i = static_cast<size_type>(std::lower_bound(
::boost::make_transform_iterator(event_coordinates().begin(),
xval),
::boost::make_transform_iterator(event_coordinates().end(),
xval),
x
) - ::boost::make_transform_iterator(event_coordinates().begin(),
xval);
xval));
is_event = (i < static_cast<size_type>(event_coordinates().size()) &&
(event_coordinates()[i].val == x) );
}
@ -1523,7 +1519,7 @@ public:
Principal_sturm_habicht_iterator principal_sturm_habicht_end() const {
return boost::make_transform_iterator
(boost::counting_iterator<size_type>
(sturm_habicht_of_primitive().size()),
(static_cast<int>(sturm_habicht_of_primitive().size())),
Stha_functor(this));
}
@ -2548,9 +2544,6 @@ std::istream& operator>> (
} //namespace CGAL
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#include <CGAL/enable_warnings.h>
#endif // ALGEBRAIC_CURVE_2_H

35
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h
View File

@ -26,6 +26,8 @@
#ifndef CGAL_ACK_CURVE_PAIR_ANALYSIS_H
#define CGAL_ACK_CURVE_PAIR_ANALYSIS_H 1
#include <CGAL/disable_warnings.h>
#include <vector>
#include <algorithm>
@ -43,10 +45,7 @@
#include <CGAL/Algebraic_kernel_d/exceptions.h>
#include <CGAL/Algebraic_kernel_d/Status_line_CPA_1.h>
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4290)
#endif
namespace CGAL {
@ -803,7 +802,7 @@ private:
(typename Polynomial_traits_2::Swap() (sres,0,1),r);
std::vector<Algebraic_real_1> gcd_roots;
kernel()->solve_1_object()(gcd,std::back_inserter(gcd_roots),false);
int m = gcd_roots.size();
size_type m = static_cast<size_type>(gcd_roots.size());
Slice_info slice_info = construct_slice_info(x);
reduce_number_of_candidates_and_intersections_to
@ -999,9 +998,9 @@ public:
void x_to_index(Algebraic_real_1 x,
size_type& idx, bool& event) const {
const std::vector<Algebraic_real_1>& sl = event_x_coordinates();
idx = std::lower_bound(sl.begin(),
sl.end(),
x) - sl.begin();
idx = static_cast<size_type>(std::lower_bound(sl.begin(),
sl.end(),
x) - sl.begin());
event = (idx < static_cast<size_type>(sl.size()) && (sl[idx] == x));
}
@ -1123,16 +1122,14 @@ private:
}
Intersection_info_container& old_info_container
= *(this->ptr()->intersection_info_container);
size_type n = old_info_container.size();
CGAL_assertion(n == static_cast<size_type>
( new_info_container.size()));
std::size_t n = old_info_container.size();
CGAL_assertion(n == new_info_container.size());
//iterate through the vector and update
// (-1 stands for "multiplicity unknown")
for(size_type i=0;i<n;i++) {
size_type m = old_info_container[i].size();
CGAL_assertion(m == static_cast<size_type>\
(new_info_container[i].size()));
for(size_type j=0;j<m;j++) {
for(std::size_t i=0;i<n;i++) {
std::size_t m = old_info_container[i].size();
CGAL_assertion(m == new_info_container[i].size());
for(std::size_t j=0;j<m;j++) {
old_info_container[i][j].mult
= (std::max)(new_info_container[i][j].mult,
old_info_container[i][j].mult);
@ -2644,10 +2641,6 @@ reduce_number_of_candidates_and_intersections_to(size_type n,
} //namespace CGAL
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#include <CGAL/enable_warnings.h>
#endif

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Event_line_builder.h
View File

@ -340,7 +340,7 @@ protected:
bool k_fixed=false;
int seq_size = std::distance(seq_begin,seq_end);
std::ptrdiff_t seq_size = static_cast<std::ptrdiff_t>(std::distance(seq_begin,seq_end));
typedef int VT;

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/LRU_hashed_map.h
View File

@ -315,7 +315,7 @@ public:
//! \brief default constructor
LRU_hashed_map_with_kernel(Algebraic_kernel_with_analysis_2* kernel,
unsigned max_size = -1u) :
unsigned max_size = (std::numeric_limits<unsigned>::max)()) :
Base(max_size),
_m_kernel(kernel)
{ }

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h
View File

@ -388,7 +388,7 @@ public:
: public CGAL::unary_function< Gmpz, long > {
long operator()( const Gmpz& x ) const {
CGAL_precondition(!CGAL::is_zero(x));
return mpz_sizeinbase(x.mpz(),2)-1;
return static_cast<long>(mpz_sizeinbase(x.mpz(),2)-1);
}
};
@ -396,7 +396,7 @@ public:
: public CGAL::unary_function< Gmpz, long > {
long operator()( const Gmpz& x ) const {
long pos = mpz_scan1(x.mpz(),0);
long size = mpz_sizeinbase(x.mpz(),2);
long size = static_cast<long>(mpz_sizeinbase(x.mpz(),2));
if (pos == size-1)
return size-1;
else

20
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h
View File

@ -24,7 +24,10 @@
#ifndef CGAL_ACK_SHEAR_CONTROLLER
#define CGAL_ACK_SHEAR_CONTROLLER 1
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Random.h>
#include <CGAL/tss.h>
#include<set>
@ -52,15 +55,16 @@ namespace CGAL {
//! Constructor, getting the maximal absolute value of the shear factor
Shear_controller()
: m_max(InitialMax)
, pos_next_factor(0) {
CGAL_assertion(m_max>=1);
:
#if CGAL_ACK_STATIC_SEED
#warning Warning, uses static seed!
srand(CGAL_ACK_STATIC_SEED);
rng(CGAL_ACK_STATIC_SEED)
#else
srand(time(NULL));
rng()
#endif
, m_max(InitialMax)
, pos_next_factor(0) {
CGAL_assertion(m_max>=1);
}
//! Reports that the shear factor \c factor was bad.
@ -87,13 +91,15 @@ namespace CGAL {
Int get_new_shear_factor() {
CGAL_assertion(int(this->bad_shears.size())<m_max);
while(true) {
Int s = Int(rand()%m_max)+1;
Int s = Int((rng.get_int(0,(std::numeric_limits<int>::max)())%m_max )+1);
if(bad_shears.find(s)==bad_shears.end()) {
return s;
}
}
}
Random rng;
// Maximal absolute value
Int m_max;
@ -112,4 +118,6 @@ namespace CGAL {
} // namespace internal
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ACK_SHEAR_CONTROLLER

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Status_line_CPA_1.h
View File

@ -258,7 +258,7 @@ public:
* line component of the curve at the given x-coordinate.
*/
size_type number_of_events() const {
return this->ptr()->_m_arcs.size();
return static_cast<size_type>(this->ptr()->_m_arcs.size());
}

6
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_1.h
View File

@ -26,6 +26,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_1_H
#define CGAL_ALGEBRAIC_KERNEL_D_1_H
#include <CGAL/disable_warnings.h>
#ifndef CGAL_AK_ENABLE_DEPRECATED_INTERFACE
#define CGAL_AK_ENABLE_DEPRECATED_INTERFACE 0
#endif
@ -343,7 +345,7 @@ public:
std::vector<std::pair<Algebraic_real_1,Multiplicity_type> > roots;
Solve_1()(p,std::back_inserter(roots));
return roots.size();
return static_cast<size_type>(roots.size());
}
};
@ -671,6 +673,6 @@ class Algebraic_kernel_d_1
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_1_H

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d_2.h
View File

@ -24,6 +24,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_D_2_H
#define CGAL_ALGEBRAIC_KERNEL_D_2_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h>
#include <CGAL/Algebraic_kernel_d_1.h>
@ -38,6 +40,6 @@ template<typename Coefficient> class Algebraic_kernel_d_2
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_D_1_H

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpq_d_1.h
View File

@ -22,6 +22,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_RS_GMPQ_D_1
#define CGAL_ALGEBRAIC_KERNEL_RS_GMPQ_D_1
#include <CGAL/disable_warnings.h>
#include <CGAL/Gmpq.h>
#include <CGAL/Gmpfr.h>
#include <CGAL/Polynomial.h>
@ -118,4 +120,6 @@ typedef CGAL::RS_AK1::Algebraic_kernel_z_1<
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_RS_GMPQ_D_1

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_rs_gmpz_d_1.h
View File

@ -22,6 +22,8 @@
#ifndef CGAL_ALGEBRAIC_KERNEL_RS_GMPZ_D_1
#define CGAL_ALGEBRAIC_KERNEL_RS_GMPZ_D_1
#include <CGAL/disable_warnings.h>
#include <CGAL/Gmpz.h>
#include <CGAL/Gmpfr.h>
#include <CGAL/Polynomial.h>
@ -69,4 +71,6 @@ typedef CGAL::RS_AK1::Algebraic_kernel_1<
}
#include <CGAL/enable_warnings.h>
#endif // CGAL_ALGEBRAIC_KERNEL_RS_GMPZ_D_1

8
Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.cpp
View File

@ -46,7 +46,7 @@ void test_routine() {
rr(p,std::back_inserter(v1),true);
int n = std::distance(v1.begin(),v1.end());
std::ptrdiff_t n = std::distance(v1.begin(),v1.end());
assert(n==3);
@ -70,7 +70,7 @@ void test_routine() {
rr2(p,std::back_inserter(v2),false);
int n = std::distance(v2.begin(), v2.end());
std::ptrdiff_t n = std::distance(v2.begin(), v2.end());
assert(n==4);
@ -94,7 +94,7 @@ void test_routine() {
rr1(p,std::back_inserter(v1),false);
int n = std::distance(v1.begin(), v1.end());
std::ptrdiff_t n = std::distance(v1.begin(), v1.end());
assert(n==0);
@ -118,7 +118,7 @@ void test_routine() {
rr2(p,std::back_inserter(v2),false);
int n = std::distance(v2.begin(), v2.end());
std::ptrdiff_t n = std::distance(v2.begin(), v2.end());
assert(n==1);

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

@ -26,6 +26,7 @@
#include <CGAL/license/Apollonius_graph_2.h>
#include <CGAL/disable_warnings.h>
#define CGAL_APOLLONIUS_GRAPH_PSEUDO_CIRCLE_DESIGN 1
@ -1345,5 +1346,6 @@ std::istream& operator>>(std::istream& is,
#include <CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif // CGAL_APOLLONIUS_GRAPH_2_H

3
Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h
View File

@ -24,7 +24,7 @@
#define CGAL_ARR_BEZIER_CURVE_TRAITS_2_H
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_Bezier_curve_traits_2 class.
@ -881,4 +881,5 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
View File

@ -24,6 +24,8 @@
#ifndef CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
#define CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
#include <CGAL/disable_warnings.h>
#include <CGAL/config.h>
#include <CGAL/Algebraic_kernel_d/flags.h>
@ -657,4 +659,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS

4
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/No_intersection_surface_sweep_2.h>
#include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@ -145,4 +147,6 @@ locate(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
View File

@ -26,6 +26,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the Arr_bounded_planar_topology_traits_2<GeomTraits> class.
@ -551,4 +553,6 @@ public:
#include <CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arr_circle_segment_traits_2<Kenrel> class.
@ -749,4 +750,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -180,4 +181,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_CIRCULAR_ARC_TRAITS_H

4
Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h
View File

@ -29,6 +29,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -620,4 +622,6 @@ namespace CGAL {
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_VARIANT_TRAITS_H

3
Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The conic traits-class for the arrangement package.
@ -875,5 +876,7 @@ public:
//@}
};
#include <CGAL/enable_warnings.h>
} //namespace CGAL
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_consolidated_curve_data_traits_2<Traits,Data> class.
@ -99,4 +100,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* A counting traits-class for the arrangement package.
@ -1066,4 +1067,6 @@ Out_stream& operator<<(Out_stream& os,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h
View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_curve_data_traits_2<> class template.
*/
@ -441,4 +443,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the base DCEL class for planar arrangements and its
@ -1459,4 +1460,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the Arr_default_dcel<Traits> class.
@ -67,4 +68,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of default overlay-traits classes.
@ -91,4 +93,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_directional_non_caching_segment_basic_traits_2.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_non_caching_segment_basic_traits_2.h>
@ -154,4 +155,6 @@ public:
}
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_enums.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the enumeration types for the arrangement package.
@ -216,4 +217,6 @@ InputStream& operator>>(
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The definition of the extended DCEL classes.
@ -285,4 +286,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_face_index_map.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_face_index_map<Arrangement> class.
@ -278,4 +279,6 @@ unsigned int get (const CGAL::Arr_face_index_map<Arrangement>& index_map,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The partition traits class for geodesic arcs on the sphere enables
@ -616,4 +617,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_ARR_GEODESIC_ARC_ON_SPHERE_PARTITION_TRAITS_2_H

2
Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
// #define CGAL_FULL_X_MONOTONE_GEODESIC_ARC_ON_SPHERE_IS_SUPPORTED 1
@ -3255,4 +3256,5 @@ operator>>(InputStream& is,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

18
Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h
View File

@ -475,7 +475,7 @@ _Bezier_cache<NtTraits>::get_intersections
{
// Construct a vector of distances from the current point to all other
// points in the pts2 list.
const int n_pts2 = pts2_ptr->size();
const int n_pts2 = static_cast<int>(pts2_ptr->size());
std::vector<Distance_iter> dist_vec (n_pts2);
for (k = 0, pit2 = pts2_ptr->begin(); pit2 != pts2_ptr->end(); k++, ++pit2)
@ -730,15 +730,15 @@ _Bezier_cache<NtTraits>::_compute_resultant
// Create the Sylvester matrix of polynomial coefficients. Also prepare
// the exp_fact vector, that represents the normalization factor (see
// below).
const int m = bp1.size() - 1;
const int n = bp2.size() - 1;
const int dim = m + n;
const std::size_t m = bp1.size() - 1;
const std::size_t n = bp2.size() - 1;
const std::size_t dim = m + n;
const Integer zero = 0;
const Polynomial zero_poly = nt_traits.construct_polynomial (&zero, 0);
int i, j, k;
std::size_t i, j, k;
std::vector<std::vector<Polynomial> > mat (dim);
std::vector <int> exp_fact (dim);
std::vector <std::size_t> exp_fact (dim);
for (i = 0; i < dim; i++)
{
@ -751,11 +751,11 @@ _Bezier_cache<NtTraits>::_compute_resultant
// Initialize it with copies of the two bivariate polynomials.
for (i = 0; i < n; i++)
for (j = m; j >= 0; j--)
for (j = 0; j <= m; ++j)
mat[i][i + j] = bp1[j];
for (i = 0; i < m; i++)
for (j = n; j >= 0; j--)
for (j = 0; j <= n;++j)
mat[n + i][i + j] = bp2[j];
// Perform Gaussian elimination on the Sylvester matrix. The goal is to
@ -850,7 +850,7 @@ _Bezier_cache<NtTraits>::_compute_resultant
Polynomial diag_prod = mat[dim - 1][dim - 1];
CGAL_assertion (exp_fact [dim - 1] == 0);
for (i = dim - 2; i >= 0; i--)
for (i = 0; i+2 <= dim; ++i)
{
// Try to avoid unnecessary multiplications by ignoring the current
// diagonal item if its exponent in the normalization factor is greater

6
Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_curve_2.h
View File

@ -158,7 +158,7 @@ public:
p_normY(NULL)
{
// Copy the control points and compute their bounding box.
const int pts_size = std::distance (pts_begin, pts_end);
const int pts_size = static_cast<int>(std::distance (pts_begin, pts_end));
double x, y;
double x_min = 0, x_max = 0;
double y_min = 0, y_max = 0;
@ -416,7 +416,7 @@ public:
*/
unsigned int number_of_control_points () const
{
return (this->_rep()._ctrl_pts.size());
return static_cast<unsigned int>((this->_rep()._ctrl_pts.size()));
}
/*!
@ -684,7 +684,7 @@ template <class RatKer, class AlgKer, class NtTrt, class BndTrt>
void _Bezier_curve_2_rep<RatKer, AlgKer, NtTrt,
BndTrt>::_construct_polynomials () const
{
const int n = _ctrl_pts.size() - 1;
const int n = static_cast<int>(_ctrl_pts.size() - 1);
Rational *coeffsX = new Rational [n + 1];
Rational *coeffsY = new Rational [n + 1];
const Rational rat_zero = Rational (0);

6
Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/de_Casteljau_2.h
View File

@ -61,7 +61,7 @@ bisect_control_polygon_2(InputIterator ctrl_pts_begin,
typedef typename _Kernel::Construct_midpoint_2 _Construct_midpoint_2;
// Grab a local copy of the control points.
const unsigned int n_pts = std::distance(ctrl_pts_begin, ctrl_pts_end);
const unsigned int n_pts = static_cast<unsigned int>(std::distance(ctrl_pts_begin, ctrl_pts_end));
CGAL_precondition(n_pts != 0);
std::vector<_Point_2> vec(n_pts);
@ -125,7 +125,7 @@ typename InputIterator::value_type point_on_Bezier_curve_2
typedef typename _Kernel::FT _NT;
// Grab a local copy of the control points.
const unsigned int n_pts = std::distance(ctrl_pts_begin, ctrl_pts_end);
const unsigned int n_pts = static_cast<unsigned int>(std::distance(ctrl_pts_begin, ctrl_pts_end));
CGAL_precondition(n_pts != 0);
std::vector<_Point_2> vec(n_pts);
@ -182,7 +182,7 @@ typename InputIterator::value_type de_Casteljau_2
typedef typename _Kernel::FT _NT;
// Grab a local copy of the control points.
const unsigned int n_pts = std::distance(ctrl_pts_begin, ctrl_pts_end);
const unsigned int n_pts = static_cast<unsigned int>(std::distance(ctrl_pts_begin, ctrl_pts_end));
CGAL_precondition(n_pts != 0);
std::vector<_Point_2> vec(n_pts);

3
Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_landmarks_point_location<Arrangement> template.
@ -318,4 +319,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_landmarks_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* This file was developed at Inria, France, and copied over to the
@ -128,4 +129,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_CIRCULAR_KERNEL_LINE_ARC_TRAITS_H

3
Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for handling linear objects (lines, rays and segments)
@ -2026,4 +2027,6 @@ InputStream& operator>> (InputStream& is, Arr_linear_object_2<Kernel>& lobj)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_point_location_result.h>
#include <CGAL/Arrangement_2/Arr_traits_adaptor_2.h>
@ -120,4 +121,6 @@ public:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_naive_point_location_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h
View File

@ -30,6 +30,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file The basic non-caching segment traits-class for the arrangement
* package. This traits class handles x-monotone non-intersecting segments.
@ -282,4 +283,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file The non-caching segment traits-class for the arrangement package.
* This traits class handles general segments. It is a model of the
@ -433,4 +434,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_observer.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arr_enums.h>
@ -678,4 +679,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the global Arr_overlay_2() function.
@ -260,4 +262,6 @@ overlay(const Arrangement_on_surface_2<GeometryTraitsA_2, TopologyTraitsA>& arr1
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_point_location_result.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
// The macro CGAL_ARR_POINT_LOCATION_VERSION controls which version of the
// point location is used. Currently two values are supported:
@ -118,4 +119,6 @@ struct Arr_point_location_result {
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_polycurve_basic_traits_2.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the general piece-wise (polycurve) type of curves of the
@ -2728,4 +2729,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the general piece-wise (polycurve) type of curves of the
@ -1188,4 +1189,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
View File

@ -27,6 +27,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The traits-class for the linear piece-wiese(polyline) type of curves of the
@ -608,4 +609,6 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

11
Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Cache.h
View File

@ -281,10 +281,9 @@ private:
}
//re-set watermark
_rat_func_map_watermark = (std::max)(
2*_rat_func_map.size(),
typename Rational_function_map::size_type(128));
_rat_func_map_watermark
= static_cast<unsigned int>((std::max)(2* _rat_func_map.size(),
typename Rational_function_map::size_type(128)));
return;
}
void rat_pair_map_clean_up() const
@ -311,8 +310,8 @@ private:
//re-set watermark
_rat_pair_map_watermark =
(std::max)(2*_rat_pair_map.size(),
typename Rational_function_canonicalized_pair_map::size_type(128));
static_cast<unsigned int>((std::max)(2* _rat_pair_map.size(),
typename Rational_function_canonicalized_pair_map::size_type(128)));
}
private:

2
Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/assertions.h>
#include <CGAL/tags.h>
@ -1315,5 +1316,6 @@ public:
} //namespace CGAL {
#include <CGAL/enable_warnings.h>
#endif //CGAL_ARR_RATIONAL_ARC_TRAITS_D_1_H

2
Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The segment traits-class for the arrangement package.
@ -1175,5 +1176,6 @@ InputStream& operator>>(InputStream& is, Arr_segment_2<Kernel>& seg)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_simple_point_location<Arrangement> template.
@ -195,4 +196,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_simple_point_location_impl.h>
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* The topology traits for great spherical arcs embedded on a sphere for the
@ -668,4 +670,6 @@ protected:
#include <CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_tags.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/config.h>
#include <boost/type_traits.hpp>
@ -646,5 +647,7 @@ public:
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* A tracing traits-class for the arrangement package.
@ -1274,4 +1275,6 @@ OutputStream & operator<<(OutputStream & os, Comparison_result cr)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_trapezoid_ric_point_location<Arrangement> template.
@ -426,4 +427,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
View File

@ -23,6 +23,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_triangulation_point_location<Arrangement> template.
@ -390,4 +392,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_triangulation_pl_functions.h>
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
*
* Definition of the Arr_unb_planar_topology_traits_2<GeomTraits> class.
@ -594,4 +596,6 @@ protected:
#include <CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_vertex_index_map.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_vertex_index_map<Arrangement> class.
@ -282,4 +284,6 @@ unsigned int get (const CGAL::Arr_vertex_index_map<Arrangement>& index_map,
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
View File

@ -23,6 +23,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/No_intersection_surface_sweep_2.h>
#include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@ -148,4 +150,6 @@ decompose(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
} // namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the Arr_walk_along_line_point_location<Arrangement> template.
@ -206,4 +207,6 @@ protected:
// The member-function definitions can be found under:
#include <CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_2<Traits,Dcel> class.
@ -255,4 +256,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

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

@ -31,6 +31,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_on_surface_2<Traits,Dcel> class.
@ -3010,4 +3011,5 @@ bool do_intersect(Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
#include <CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h>
#include <CGAL/Arrangement_2/Arrangement_on_surface_2_global.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_on_surface_with_history_2 class.
@ -995,4 +996,6 @@ overlay (const Arrangement_on_surface_with_history_2<GeomTraits, TopTraits1>&
// The function definitions can be found under:
#include <CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The header file for the Arrangement_with_history_2<Traits,Dcel> class.
@ -274,4 +275,6 @@ protected:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
View File

@ -26,6 +26,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Defintion of the Arrangement_zone_2 class.
@ -443,4 +445,6 @@ private:
// The function definitions can be found under:
#include <CGAL/Arrangement_2/Arrangement_zone_2_impl.h>
#include <CGAL/enable_warnings.h>
#endif

6
Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h
View File

@ -24,6 +24,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* The number-type traits for CORE algebraic numbers.
@ -588,7 +590,7 @@ public:
poly.getCoeff(1),
poly.getCoeff(0),
buffer);
unsigned int num_of_roots = std::distance(&buffer[0], end_buffer);
unsigned int num_of_roots = static_cast<unsigned int>(std::distance(&buffer[0], end_buffer));
for (i = 0; i < num_of_roots; ++i)
{
@ -621,4 +623,6 @@ public:
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

2
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Curve_interval_arcno_cache.h
View File

@ -115,7 +115,7 @@ struct Curve_interval_arcno_cache {
Curve_analysis_2 ca_2 = cv_line.curve_analysis_2();
///////////////////////////////// polynomial or curve id ?
int curve_id = ca_2.polynomial_2().id();
int curve_id = static_cast<int>(ca_2.polynomial_2().id());
/////////////////////////////////
if(_m_last_curve_id != curve_id) {
typename Curve_to_interval_arcno_map::iterator it;

4
Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
View File

@ -25,6 +25,8 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the specialized boost::graph_traits<Arrangement_2> class.
@ -613,4 +615,6 @@ edges (const CGAL::Arrangement_on_surface_2<GeomTraits, TopTraits>& arr)
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

3
Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Arrangement_on_surface_2.h>
#include <CGAL/disable_warnings.h>
/*! \file
* Definition of the specialized Dual<Arrangement_2> class,
@ -749,4 +750,6 @@ edges (const CGAL::Dual<CGAL::
} //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif

4
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h
View File

@ -14,6 +14,8 @@
#include "utils.h"
#include "IO_base_test.h"
#include <CGAL/disable_warnings.h>
/*! Construction test */
template <typename T_Geom_traits, typename T_Topol_traits>
class Construction_test :
@ -675,4 +677,6 @@ bool Construction_test<T_Geom_traits, T_Topol_traits>::perform()
return true;
}
#include <CGAL/enable_warnings.h>
#endif

1
Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h
View File

@ -3,6 +3,7 @@
template <typename GeomTraits_>
class IO_base_test {
IO_base_test<GeomTraits_>& operator=(const IO_base_test<GeomTraits_>&);
public:
typedef GeomTraits_ Geom_traits;
typedef typename Geom_traits::Point_2 Point_2;

4
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
View File

@ -17,6 +17,8 @@
#include <CGAL/Arr_point_location_result.h>
#include <CGAL/Arr_triangulation_point_location.h>
#include <CGAL/disable_warnings.h>
#include "IO_test.h"
/*! Point location test */
@ -927,4 +929,6 @@ verify(Variants_vector objs[MAX_NUM_POINT_LOCATION_STRATEGIES],
return result;
}
#include <CGAL/enable_warnings.h>
#endif

1
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
View File

@ -52,6 +52,7 @@
template <typename Geom_traits_T>
class Traits_base_test : public IO_test<Geom_traits_T> {
Traits_base_test<Geom_traits_T>& operator=(const Traits_base_test<Geom_traits_T>&);
protected:
typedef Geom_traits_T Traits;
typedef IO_test<Traits> Base;

3
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h
View File

@ -24,6 +24,7 @@
template <typename Geom_traits_T>
class Traits_test : public Traits_base_test<Geom_traits_T> {
private:
Traits_test<Geom_traits_T>& operator=(const Traits_test<Geom_traits_T>&);
typedef Geom_traits_T Traits;
typedef Traits_base_test<Traits> Base;
typedef typename Base::Enum_type Enum_type;
@ -1456,7 +1457,7 @@ compare_x_at_limit_wrapper_imp(std::istringstream& str_stream,
std::cout << "Test: compare_x_at_limit( ";
CGAL::Comparison_result real_answer;
unsigned int id1, id2;
unsigned int id1 = 0, id2 = 0 ;
// first argument must be a number (either a point or a xcurve)
str_stream >> id1;
std::pair<Enum_type, unsigned int> next_input =

1
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
View File

@ -29,6 +29,7 @@ typedef Traits_2::Point_2 Point_2;
template <typename Cmp_object>
struct Cmp {
Cmp<Cmp_object>& operator=(const Cmp<Cmp_object>&);
const Cmp_object& m_cmp_object;
Cmp(const Cmp_object& cmp_object) : m_cmp_object(cmp_object) {}
bool operator()(const Point_2& p1, const Point_2& p2) const

Some files were not shown because too many files have changed in this diff Show More