diff --git a/Triangulation_3/changes.txt b/Triangulation_3/changes.txt index 490d2d9a442..0e00dc11eb2 100644 --- a/Triangulation_3/changes.txt +++ b/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +13 March 2006 Andreas Fabri +- Instead of forwarding it is enough to ot use using + 13 March 2006 Andreas Fabri - Forward call to base class as using directive fails for VC7 in Regular_triangulation_filtered_traits_3.h 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 62cabe608ec..267aff78e82 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_filtered_traits_3.h @@ -41,24 +41,11 @@ 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 ad887c854c0..bcfd6c03a8d 100644 --- a/Triangulation_3/test/Triangulation_3/Makefile +++ b/Triangulation_3/test/Triangulation_3/Makefile @@ -20,7 +20,7 @@ CXXFLAGS = \ $(CGAL_CXXFLAGS) \ -Iinclude \ $(LONG_NAME_PROBLEM_CXXFLAGS) \ - -g -DCGAL_NO_DEPRECATED_CODE + -g #---------------------------------------------------------------------# # linker flags