diff --git a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h index edfb15ae9e9..24506496993 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/KernelD_converter.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -114,19 +115,25 @@ class KernelD_converter_ > { // TODO: use the intersection of Kn::Object_list. -template::type +template::type, typename Get_type::type> //typeset::add::type/*::add::type*/ > class KernelD_converter : public Store_kernel, public Store_kernel2, - public KernelD_converter_,K1,K2,List_> + public KernelD_converter_, + K1,K2,typename Default::Get::type>::type> { + typedef typename Default::Get::type>::type List; typedef KernelD_converter Self; typedef Self Final_; - typedef KernelD_converter_ Base; + typedef KernelD_converter_ Base; typedef typename Get_type::type FT1; typedef typename Get_type::type FT2; - typedef NT_converter NTc; NTc c; // TODO: compressed storage as this is likely empty and the converter gets passed around (and stored in iterators) public: @@ -176,7 +183,7 @@ typename typeset_intersection::type Possibilities; + typedef typename internal::Map_taglist_to_typelist::type Possibilities; //TODO: add Empty, vector, etc to the list. return Object_converter()(obj,*this); }