From 9cb221ab1f586fd16f88d30e69085db50c61cf8b Mon Sep 17 00:00:00 2001 From: Tran Kai Frank Da Date: Fri, 4 Feb 2000 12:56:06 +0000 Subject: [PATCH] now CGAL-2.2-I --- Packages/Alpha_shapes_2/changes.txt | 6 ++++++ .../Alpha_shapes_2/demo/Alpha_shapes_2/Makefile | 4 ++-- .../examples/Alpha_shapes_2/Makefile | 4 ++-- .../examples/Alpha_shapes_2/Makefile.vc | 2 +- .../include/CGAL/smallest_radiusH2.h | 4 ++-- .../include/CGAL/smallest_radius_2.h | 14 +++++++------- .../Alpha_shapes_2/test/Alpha_shapes_2/Makefile | 4 ++-- .../Alpha_shapes_2/test/Alpha_shapes_2/Makefile.vc | 2 +- Packages/Alpha_shapes_2/version | 2 +- 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Packages/Alpha_shapes_2/changes.txt b/Packages/Alpha_shapes_2/changes.txt index 62fbb4e10fb..30444702927 100644 --- a/Packages/Alpha_shapes_2/changes.txt +++ b/Packages/Alpha_shapes_2/changes.txt @@ -1,3 +1,9 @@ +version 6.0: +And now CGAL-2.2-I... + +version 5.5: +This one for CGAL-2.1 + version 5.0: Ready now... diff --git a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile index 5198319d205..b2e15642d44 100644 --- a/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/demo/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA +CGAL_MAKEFILE = $(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA #$(UTIL)/CGAL-I/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA #makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA @@ -22,7 +22,7 @@ include $(CGAL_MAKEFILE) #----------------------------------------------------------------------# # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local -CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ +CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \ $(CGAL_CXXFLAGS) \ -mcpu=ultrasparc -mtune=ultrasparc -O2 \ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ diff --git a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile index 23a3bd7cd2c..91172ec31fa 100644 --- a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA +CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA # for cygwin #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 @@ -26,7 +26,7 @@ include $(CGAL_MAKEFILE) #----------------------------------------------------------------------# # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local -CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ +CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \ $(CGAL_CXXFLAGS) \ -mcpu=ultrasparc -mtune=ultrasparc -O2 \ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ diff --git a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile.vc b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile.vc index d11fe9cf843..1db2929cf10 100644 --- a/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile.vc +++ b/Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile.vc @@ -25,7 +25,7 @@ include $(CGAL_MAKEFILE) #----------------------------------------------------------------------# # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local -CXXFLAGS = '-Iz:\Cgal-2.0\To_submit\Alpha_shapes_2\include' \ +CXXFLAGS = '-Iz:\Cgal-I\For_Submission\Alpha_shapes_2\include' \ $(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \ # for cygwin diff --git a/Packages/Alpha_shapes_2/include/CGAL/smallest_radiusH2.h b/Packages/Alpha_shapes_2/include/CGAL/smallest_radiusH2.h index 009b10d5349..874a8bf3162 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/smallest_radiusH2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/smallest_radiusH2.h @@ -36,12 +36,12 @@ inline squared_radius_circumcircle(const PointH2 &p, // compute the smallest radius directly if (orientation(p, q, r) == COLLINEAR) // what do we do - return R_FT_return(R)(0); + return typename R::FT (0); else { Circle_2 c(p, q, r); - return R_FT_return(R)(c.squared_radius()); + return typename R::FT (c.squared_radius()); } } diff --git a/Packages/Alpha_shapes_2/include/CGAL/smallest_radius_2.h b/Packages/Alpha_shapes_2/include/CGAL/smallest_radius_2.h index 58a59798169..c40791f77b8 100644 --- a/Packages/Alpha_shapes_2/include/CGAL/smallest_radius_2.h +++ b/Packages/Alpha_shapes_2/include/CGAL/smallest_radius_2.h @@ -42,9 +42,9 @@ CGAL_BEGIN_NAMESPACE template inline -R_FT_return(R) - squared_radius_smallest_circumcircle(const Point_2 &p, - const Point_2 &q) +typename R::FT +squared_radius_smallest_circumcircle(const Point_2 &p, + const Point_2 &q) { typedef typename R::FT Return_type; Vector_2 v(p - q); @@ -53,10 +53,10 @@ R_FT_return(R) template inline -R_FT_return(R) - squared_radius_circumcircle(const Point_2 &p, - const Point_2 &q, - const Point_2 &r) +typename R::FT +squared_radius_circumcircle(const Point_2 &p, + const Point_2 &q, + const Point_2 &r) { typedef typename R::Point_2_base Point_two; // compute the smallest radius directly diff --git a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile index 342504b2658..c8a9745baae 100644 --- a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile +++ b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile @@ -5,7 +5,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1-I-44/make/makefile_sparc_SunOS-5.6_eg++-egcs-2.91.66_LEDA +CGAL_MAKEFILE =$(UTIL)/CGAL/CGAL-2.1/make/makefile_sparc_SunOS-5.6_g++-2.95.2_LEDA # for cygwin #\prisme\CGAL\CGAL-2.1-I-30\make\makefile_i686_CYGWINNT-4.0-20.1_CL.EXE-12.00.8168 @@ -26,7 +26,7 @@ include $(CGAL_MAKEFILE) #----------------------------------------------------------------------# # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local -CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \ +CXXFLAGS = -I$(HOME)/Cgal-I/For_Submission/Alpha_shapes_2/include \ $(CGAL_CXXFLAGS) -O2 \ -mcpu=ultrasparc -mtune=ultrasparc \ -B /u/alcor/0/prisme_util/Binutils/SunOS/bin/ diff --git a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile.vc b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile.vc index 6b72358a3f1..38bc8c9f29c 100644 --- a/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile.vc +++ b/Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile.vc @@ -25,7 +25,7 @@ include $(CGAL_MAKEFILE) #----------------------------------------------------------------------# # rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local -CXXFLAGS = '-Iz:\Cgal-2.0\To_submit\Alpha_shapes_2\include' \ +CXXFLAGS = '-Iz:\Cgal-I\For_Submission\Alpha_shapes_2\include' \ $(TESTSUITE_CXXFLAGS) $(CGAL_CXXFLAGS) \ # for cygwin diff --git a/Packages/Alpha_shapes_2/version b/Packages/Alpha_shapes_2/version index d9b477e6aa0..8c58e8d1b40 100644 --- a/Packages/Alpha_shapes_2/version +++ b/Packages/Alpha_shapes_2/version @@ -1 +1 @@ -5.5 (16 Dec 1999) +6.0 ( 4 Feb 2000)