diff --git a/Filtered_kernel/include/CGAL/Lazy_kernel.h b/Filtered_kernel/include/CGAL/Lazy_kernel.h index 1be858d8e7d..fb1fc21214c 100644 --- a/Filtered_kernel/include/CGAL/Lazy_kernel.h +++ b/Filtered_kernel/include/CGAL/Lazy_kernel.h @@ -320,10 +320,11 @@ public: // typedef void Compute_z_3; // to detect where .z() is called // typedef void Construct_point_3; // to detect where the ctor is called - /* + struct Compute_weight_2 : public BaseClass::Compute_weight_2 { typedef typename Kernel_::FT FT; + typedef typename Kernel_::Point_2 Point_2; typedef typename Kernel_::Weighted_point_2 Weighted_point_2; FT operator()(const Weighted_point_2& p) const @@ -339,17 +340,16 @@ public: FT > LR; + LR * lr = dynamic_cast(p.ptr()); if(lr){ - std::cout << "return l2" << std::endl; return lr->l2; } - std::cout << "call base class" << std::endl; return BaseClass().compute_weight_2_object()(p); } }; - */ + struct Construct_point_2 : public BaseClass::Construct_point_2 { @@ -400,17 +400,14 @@ public: LR * lr = dynamic_cast(p.ptr()); if(lr){ - //std::cout << "construct point first dynamic cast return l2" << std::endl; return lr->l1; } else { LRint* lrint = dynamic_cast(p.ptr()); if(lrint){ - //std::cout << "construct point second dynamic cast return l2" << std::endl; return lrint->l1; } } - //std::cout << "construct point call base class" << std::endl; return BaseClass().construct_point_2_object()(p); } @@ -489,12 +486,12 @@ public: return Construct_point_3(); } - /* + Compute_weight_2 compute_weight_2_object() const { return Compute_weight_2(); } - */ + Assign_2 assign_2_object() const diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_weighted_point_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_weighted_point_2.h index 83af67904b7..f7d41190673 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_weighted_point_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_weighted_point_2.h @@ -67,17 +67,15 @@ bool _test_cls_weighted_point_2(const R& ) // accessors CGAL::Point_2 p1; - // p1 = wp1.point(); + p1 = wp1.point(); p1 = wp2.point(); assert(p1 == p0); - - std::cout << "\nA"<< std::endl; + p1 = wp3.point(); + FT w = wp3.weight(); assert(w == iw); - - std::cout << "\nB"<< std::endl; w = wp7.weight(); // no need to test the other operations as they use Point_2 operations (which