diff --git a/Triangulation_3/changes.txt b/Triangulation_3/changes.txt index 5dc92354759..490d2d9a442 100644 --- a/Triangulation_3/changes.txt +++ b/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +13 March 2006 Andreas Fabri +- Forward call to base class as using directive fails for VC7 in Regular_triangulation_filtered_traits_3.h + 20 December 2005 Sylvain Pion - Add some using declarations in Delaunay_3 (spotted by the Kernel_checker test-suite). diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h index b9d6837b165..62cabe608ec 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h @@ -41,7 +41,23 @@ struct Weighted_converter_3 typedef typename Regular_triangulation_euclidean_traits_base_3 ::Weighted_point_3 Target_wp; + typedef typename Regular_triangulation_euclidean_traits_base_3 + ::Bare_point Source_bp; + + typedef typename Regular_triangulation_euclidean_traits_base_3 + ::Bare_point Target_bp; + + +#ifndef CGAL_CFG_MATCHING_BUG_6 using Converter::operator(); +#else + Target_bp + operator()(const Source_bp &bp) const + { + return Converter::operator()(bp); + } +#endif + Target_wp operator()(const Source_wp &wp) const diff --git a/Triangulation_3/test/Triangulation_3/Makefile b/Triangulation_3/test/Triangulation_3/Makefile index ddbf225a5aa..ad887c854c0 100644 --- a/Triangulation_3/test/Triangulation_3/Makefile +++ b/Triangulation_3/test/Triangulation_3/Makefile @@ -6,7 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE +CGAL_MAKEFILE = c:/cgal/CGAL-3.2-I-384/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 include $(CGAL_MAKEFILE) #---------------------------------------------------------------------#