From 1fd1c265b3f44f6abea1ed3f8a06f2b22a0d8d3a Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Tue, 27 Apr 2004 16:11:40 +0000 Subject: [PATCH] - Fix PGCC warning. --- Packages/Kernel_d/changes.txt | 3 +++ .../Kernel_d/include/CGAL/intersections_d.h | 24 ++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Packages/Kernel_d/changes.txt b/Packages/Kernel_d/changes.txt index 66abc5d3e89..ba5fd79a7b8 100644 --- a/Packages/Kernel_d/changes.txt +++ b/Packages/Kernel_d/changes.txt @@ -1,6 +1,9 @@ Kernel_d Package: Release changes ---------------------------------------------------------------------- +27 Apr 2004 Sylvain Pion +- Fix PGCC warning. + 15 Mar 2004 Andreas Fabri - construct_Cartesian_const_iterator_d_object -> construct_cartesian_const_iterator_d_object - Added Construct_vertex_d diff --git a/Packages/Kernel_d/include/CGAL/intersections_d.h b/Packages/Kernel_d/include/CGAL/intersections_d.h index 38666f44cd8..b93bbcd058a 100644 --- a/Packages/Kernel_d/include/CGAL/intersections_d.h +++ b/Packages/Kernel_d/include/CGAL/intersections_d.h @@ -28,6 +28,12 @@ CGAL_BEGIN_NAMESPACE +// Actually, we should better list the compilers which are inferior, i.e. +// the others, which need the additional useless code. +#if !defined(__KCC) && !defined(__BORLANDC__) && !defined(__PGI) +# define CGAL_REMOVE_FLOW_WARNING +#endif + template Object intersection(const Line_d& l1, const Line_d& l2) { typedef typename R::Line_d_Line_d_pair ll_pair; @@ -44,7 +50,7 @@ Object intersection(const Line_d& l1, const Line_d& l2) case ll_pair::LINE: return make_object(l1); } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -73,7 +79,7 @@ Object intersection(const Ray_d& l1, const Ray_d& l2) return make_object(s); } } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -97,7 +103,7 @@ Object intersection(const Segment_d& l1, const Segment_d& l2) return make_object(s); } } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -119,7 +125,7 @@ Object intersection(const Line_d& l, const Ray_d& r) return make_object(r); } } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -147,7 +153,7 @@ Object intersection(const Ray_d& r, const Segment_d& s) return make_object(st); } } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -175,7 +181,7 @@ Object intersection(const Line_d& l, const Segment_d& s) return make_object(st); } } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -201,7 +207,7 @@ Object intersection(const Line_d& l, const Hyperplane_d& h) case lh_pair::LINE: return make_object(l); } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -227,7 +233,7 @@ Object intersection(const Ray_d& r, const Hyperplane_d& h) case rh_pair::RAY: return make_object(r); } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif } @@ -252,7 +258,7 @@ Object intersection(const Segment_d& s, const Hyperplane_d& h) case sh_pair::SEGMENT: return make_object(s); } -#if !defined(__KCC) && !defined(__BORLANDC__) +#ifdef CGAL_REMOVE_FLOW_WARNING return Object(); // never reached #endif }