mirror of https://github.com/CGAL/cgal
Forward call to base class as using directive fails for VC7 in Regular_triangulation_filtered_traits_3.h
This commit is contained in:
parent
ca33a2d68f
commit
c2fedb4fb9
|
|
@ -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
|
20 December 2005 Sylvain Pion
|
||||||
- Add some using declarations in Delaunay_3 (spotted by the Kernel_checker
|
- Add some using declarations in Delaunay_3 (spotted by the Kernel_checker
|
||||||
test-suite).
|
test-suite).
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,23 @@ struct Weighted_converter_3
|
||||||
typedef typename Regular_triangulation_euclidean_traits_base_3<Target_kernel>
|
typedef typename Regular_triangulation_euclidean_traits_base_3<Target_kernel>
|
||||||
::Weighted_point_3 Target_wp;
|
::Weighted_point_3 Target_wp;
|
||||||
|
|
||||||
|
typedef typename Regular_triangulation_euclidean_traits_base_3<Source_kernel>
|
||||||
|
::Bare_point Source_bp;
|
||||||
|
|
||||||
|
typedef typename Regular_triangulation_euclidean_traits_base_3<Target_kernel>
|
||||||
|
::Bare_point Target_bp;
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef CGAL_CFG_MATCHING_BUG_6
|
||||||
using Converter::operator();
|
using Converter::operator();
|
||||||
|
#else
|
||||||
|
Target_bp
|
||||||
|
operator()(const Source_bp &bp) const
|
||||||
|
{
|
||||||
|
return Converter::operator()(bp);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
Target_wp
|
Target_wp
|
||||||
operator()(const Source_wp &wp) const
|
operator()(const Source_wp &wp) const
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
#---------------------------------------------------------------------#
|
#---------------------------------------------------------------------#
|
||||||
# Choose the right include file from the <cgalroot>/make directory.
|
# Choose the right include file from the <cgalroot>/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)
|
include $(CGAL_MAKEFILE)
|
||||||
|
|
||||||
#---------------------------------------------------------------------#
|
#---------------------------------------------------------------------#
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue