Kernel_d/ -> NewKernel_d/ to avoid conflicts.

The whole content is currently private.
This commit is contained in:
Marc Glisse 2014-03-12 11:35:12 +01:00
parent ec1de48316
commit 271debb4ac
53 changed files with 85 additions and 85 deletions

View File

@ -1,10 +1,10 @@
#ifndef CGAL_EPICK_D_H
#define CGAL_EPICK_D_H
#include <CGAL/Kernel_d/Cartesian_base.h>
#include <CGAL/Kernel_d/Cartesian_static_filters.h>
#include <CGAL/Kernel_d/Cartesian_filter_K.h>
#include <CGAL/Kernel_d/Wrapper/Cartesian_wrap.h>
#include <CGAL/Kernel_d/Kernel_d_interface.h>
#include <CGAL/NewKernel_d/Cartesian_base.h>
#include <CGAL/NewKernel_d/Cartesian_static_filters.h>
#include <CGAL/NewKernel_d/Cartesian_filter_K.h>
#include <CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h>
#include <CGAL/NewKernel_d/Kernel_d_interface.h>
#include <CGAL/Gmpq.h>
#include <CGAL/Interval_nt.h>

View File

@ -1,14 +0,0 @@
#ifndef CGAL_KERNEL_D_CARTESIAN_COMPLETE_H
#define CGAL_KERNEL_D_CARTESIAN_COMPLETE_H
#include <CGAL/Kernel_d/function_objects_cartesian.h>
#include <CGAL/Kernel_d/Cartesian_per_dimension.h>
#include <CGAL/Kernel_d/Types/Segment.h>
#include <CGAL/Kernel_d/Types/Sphere.h>
#include <CGAL/Kernel_d/Types/Hyperplane.h>
#include <CGAL/Kernel_d/Types/Aff_transformation.h>
#include <CGAL/Kernel_d/Types/Line.h>
#include <CGAL/Kernel_d/Types/Ray.h>
#include <CGAL/Kernel_d/Types/Iso_box.h>
#endif // CGAL_KERNEL_D_CARTESIAN_COMPLETE_H

View File

@ -5,16 +5,16 @@
#include <CGAL/Origin.h>
#include <CGAL/representation_tags.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Uncertain.h>
#include <CGAL/typeset.h>
#include <CGAL/Kernel_d/Dimension_base.h>
#include <CGAL/Kernel_d/Cartesian_LA_functors.h>
#include <CGAL/Kernel_d/Vector/array.h>
#include <CGAL/NewKernel_d/Dimension_base.h>
#include <CGAL/NewKernel_d/Cartesian_LA_functors.h>
#include <CGAL/NewKernel_d/Vector/array.h>
#ifdef CGAL_EIGEN3_ENABLED
#include <CGAL/Kernel_d/LA_eigen/LA.h>
#include <CGAL/NewKernel_d/LA_eigen/LA.h>
#else
#include <CGAL/Kernel_d/LA_default/LA.h>
#include <CGAL/NewKernel_d/LA_default/LA.h>
#endif
namespace CGAL {

View File

@ -6,7 +6,7 @@
#include <CGAL/argument_swaps.h>
#include <CGAL/Kernel/Return_base_tag.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
namespace CGAL {
namespace CartesianDVectorBase {

View File

@ -2,8 +2,8 @@
#define CGAL_KERNEL_D_CARTESIAN_BASE_H
#include <CGAL/basic.h>
#include <CGAL/Kernel_d/Cartesian_complete.h>
#include <CGAL/Kernel_d/Cartesian_LA_base.h>
#include <CGAL/NewKernel_d/Cartesian_complete.h>
#include <CGAL/NewKernel_d/Cartesian_LA_base.h>
namespace CGAL {
#define CGAL_BASE \

View File

@ -4,7 +4,7 @@
#include <CGAL/basic.h>
#include <CGAL/NT_converter.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/Kernel_d/Cartesian_complete.h>
#include <CGAL/NewKernel_d/Cartesian_complete.h>
namespace CGAL {

View File

@ -0,0 +1,14 @@
#ifndef CGAL_KERNEL_D_CARTESIAN_COMPLETE_H
#define CGAL_KERNEL_D_CARTESIAN_COMPLETE_H
#include <CGAL/NewKernel_d/function_objects_cartesian.h>
#include <CGAL/NewKernel_d/Cartesian_per_dimension.h>
#include <CGAL/NewKernel_d/Types/Segment.h>
#include <CGAL/NewKernel_d/Types/Sphere.h>
#include <CGAL/NewKernel_d/Types/Hyperplane.h>
#include <CGAL/NewKernel_d/Types/Aff_transformation.h>
#include <CGAL/NewKernel_d/Types/Line.h>
#include <CGAL/NewKernel_d/Types/Ray.h>
#include <CGAL/NewKernel_d/Types/Iso_box.h>
#endif // CGAL_KERNEL_D_CARTESIAN_COMPLETE_H

View File

@ -2,8 +2,8 @@
#define CGAL_KERNEL_D_CARTESIAN_FILTER_K_H
#include <CGAL/basic.h>
#include <CGAL/Kernel_d/KernelD_converter.h>
#include <CGAL/Kernel_d/Filtered_predicate2.h>
#include <CGAL/NewKernel_d/KernelD_converter.h>
#include <CGAL/NewKernel_d/Filtered_predicate2.h>
#include <boost/mpl/if.hpp>
namespace CGAL {

View File

@ -2,7 +2,7 @@
#define CGAL_KERNEL_D_CARTESIAN_FILTER_NT_H
#include <CGAL/basic.h>
#include <CGAL/Kernel_d/Cartesian_change_FT.h>
#include <CGAL/NewKernel_d/Cartesian_change_FT.h>
#include <CGAL/internal/Exact_type_selector.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_KD_CARTESIAN_PER_DIM_H
#define CGAL_KD_CARTESIAN_PER_DIM_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
#include <CGAL/predicates/sign_of_determinant.h>

View File

@ -1,6 +1,6 @@
#ifndef CGAL_KD_CARTESIAN_STATIC_FILTERS_H
#define CGAL_KD_CARTESIAN_STATIC_FILTERS_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
#include <CGAL/internal/Static_filters/tools.h> // bug, should be included by the next one
#include <CGAL/internal/Static_filters/Orientation_2.h>

View File

@ -4,7 +4,7 @@
#include <algorithm>
#include <iterator>
#include <CGAL/Dimension.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
namespace CGAL {
namespace CartesianDKernelFunctors {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_DEFINE_KERNEL_TYPES_H
#define CGAL_DEFINE_KERNEL_TYPES_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/typeset.h>
#ifdef CGAL_CXX0X
#include <type_traits>

View File

@ -26,7 +26,7 @@
#include <CGAL/Interval_nt.h>
#include <CGAL/Uncertain.h>
#include <CGAL/Profile_counter.h>
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <boost/preprocessor.hpp>
namespace CGAL {

View File

@ -6,13 +6,13 @@
#include <CGAL/typeset.h>
#include <CGAL/Object.h>
#include <CGAL/NT_converter.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Kernel/mpl.h>
#include <CGAL/is_iterator.h>
#include <CGAL/transforming_iterator.h>
#include <boost/utility/enable_if.hpp>
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/Kernel_d/Kernel_object_converter.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/Kernel_object_converter.h>
namespace CGAL {
namespace internal {

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KD_KERNEL_2_INTERFACE_H
#define CGAL_KD_KERNEL_2_INTERFACE_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/marcutils.h>
#include <CGAL/tuple.h>

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KD_KERNEL_3_INTERFACE_H
#define CGAL_KD_KERNEL_3_INTERFACE_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/marcutils.h>
#include <CGAL/tuple.h>

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KD_KERNEL_D_INTERFACE_H
#define CGAL_KD_KERNEL_D_INTERFACE_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/marcutils.h>
#include <CGAL/tuple.h>

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KD_KO_CONVERTER_H
#define CGAL_KD_KO_CONVERTER_H
#include <CGAL/marcutils.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Kernel/mpl.h> // First_if_different
namespace CGAL {
template <class Tag_, class K1, class K2> struct KO_converter;

View File

@ -8,7 +8,7 @@
#include <boost/utility/enable_if.hpp>
#include <CGAL/Dimension.h>
#include <Eigen/Dense>
#include <CGAL/Kernel_d/LA_eigen/constructors.h>
#include <CGAL/NewKernel_d/LA_eigen/constructors.h>
#include <CGAL/iterator_from_indices.h>
namespace CGAL {

View File

@ -5,9 +5,9 @@
#include <CGAL/algorithm.h>
#include <CGAL/Lazy.h>
#include <CGAL/Default.h>
#include <CGAL/Kernel_d/Filtered_predicate2.h>
#include <CGAL/NewKernel_d/Filtered_predicate2.h>
#include <CGAL/iterator_from_indices.h>
#include <CGAL/Kernel_d/Define_kernel_types.h>
#include <CGAL/NewKernel_d/Define_kernel_types.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_KD_TYPE_AFF_TRANSFORMATION_H
#define CGAL_KD_TYPE_AFF_TRANSFORMATION_H
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <boost/preprocessor/repetition.hpp>
// Dummy, that's all the Kernel_d concept requires, so a useful class will wait.

View File

@ -1,6 +1,6 @@
#ifndef CGAL_KD_TYPE_HYPERPLANE_H
#define CGAL_KD_TYPE_HYPERPLANE_H
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/iterator/counting_iterator.hpp>
namespace CGAL {

View File

@ -2,7 +2,7 @@
#define CGAL_KERNELD_TYPES_ISO_BOX_H
#include <utility>
#include <CGAL/basic.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Kernel/mpl.h>
#include <CGAL/transforming_pair_iterator.h>
namespace CGAL {

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KERNELD_TYPES_LINE_H
#define CGAL_KERNELD_TYPES_LINE_H
#include <utility>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Kernel/mpl.h>
namespace CGAL {
template <class R_> class Line {

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KERNELD_TYPES_RAY_H
#define CGAL_KERNELD_TYPES_RAY_H
#include <utility>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Kernel/mpl.h>
namespace CGAL {
template <class R_> class Ray {

View File

@ -1,7 +1,7 @@
#ifndef CGAL_KERNELD_SEGMENTD_H
#define CGAL_KERNELD_SEGMENTD_H
#include <utility>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
namespace CGAL {
template <class R_> class Segment {
typedef typename Get_type<R_, FT_tag>::type FT_;

View File

@ -1,6 +1,6 @@
#ifndef CGAL_KD_TYPE_SPHERE_H
#define CGAL_KD_TYPE_SPHERE_H
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <boost/iterator/counting_iterator.hpp>
namespace CGAL {
template <class R_> class Sphere {

View File

@ -8,11 +8,11 @@
#include <boost/preprocessor/repetition.hpp>
#include <boost/preprocessor/repetition/enum.hpp>
#include <CGAL/Kernel_d/Vector/determinant_of_points_from_vectors.h>
#include <CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim.h>
#include <CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h>
#include <CGAL/Kernel_d/Vector/determinant_of_iterator_to_points_from_points.h>
#include <CGAL/Kernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_points_from_vectors.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_iterator_to_vectors.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_iterator_to_points_from_points.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_iterator_to_vectors_from_vectors.h>

View File

@ -6,7 +6,7 @@
#endif
#include <x86intrin.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
#include <CGAL/enum.h> // CGAL::Sign
#include <CGAL/number_utils.h> // CGAL::sign

View File

@ -2,7 +2,7 @@
#define CGAL_VECTOR_DET_ITER_PTS_ITER_VEC_H
#include <functional>
#include <CGAL/transforming_iterator.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_VECTOR_DET_ITER_PTS_PTS_H
#define CGAL_VECTOR_DET_ITER_PTS_PTS_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_VECTOR_DET_ITER_VEC_VEC_H
#define CGAL_VECTOR_DET_ITER_VEC_VEC_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_VECTOR_DETPTS_H
#define CGAL_VECTOR_DETPTS_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
namespace CGAL {

View File

@ -1,6 +1,6 @@
#ifndef CGAL_VECTOR_DETVEC_SMALL_H
#define CGAL_VECTOR_DETVEC_SMALL_H
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
#include <CGAL/determinant_of_vectors.h>
@ -12,7 +12,7 @@
#define CGAL_SIGN_FUNC sign_of_determinant_of_vectors
#define CGAL_SHIFT 0
#include <CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim_internal.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim_internal.h>
#undef CGAL_CLASS
#undef CGAL_TAG
@ -26,7 +26,7 @@
#define CGAL_SIGN_FUNC sign_of_determinant_of_vectors_omit_last
#define CGAL_SHIFT 1
#include <CGAL/Kernel_d/Vector/determinant_of_vectors_small_dim_internal.h>
#include <CGAL/NewKernel_d/Vector/determinant_of_vectors_small_dim_internal.h>
#undef CGAL_CLASS
#undef CGAL_TAG

View File

@ -7,7 +7,7 @@
#endif
#include <x86intrin.h> // FIXME: other platforms call it differently
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/Dimension.h>
#include <CGAL/enum.h> // CGAL::Sign
#include <CGAL/number_utils.h> // CGAL::sign

View File

@ -10,7 +10,7 @@
#include <CGAL/NT_converter.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/determinant_of_vectors.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_tags.h>
// What are the pros and cons of having NT be int vs double?

View File

@ -4,12 +4,12 @@
#include <CGAL/basic.h>
#include <CGAL/is_iterator.h>
#include <CGAL/Kernel_d/Wrapper/Point_d.h>
#include <CGAL/Kernel_d/Wrapper/Vector_d.h>
#include <CGAL/Kernel_d/Wrapper/Segment_d.h>
#include <CGAL/Kernel_d/Wrapper/Sphere_d.h>
#include <CGAL/NewKernel_d/Wrapper/Point_d.h>
#include <CGAL/NewKernel_d/Wrapper/Vector_d.h>
#include <CGAL/NewKernel_d/Wrapper/Segment_d.h>
#include <CGAL/NewKernel_d/Wrapper/Sphere_d.h>
#include <CGAL/Kernel_d/Wrapper/Ref_count_obj.h>
#include <CGAL/NewKernel_d/Wrapper/Ref_count_obj.h>
#include <boost/mpl/or.hpp>
#include <boost/mpl/contains.hpp>

View File

@ -4,15 +4,15 @@
#include <CGAL/marcutils.h>
#include <CGAL/Dimension.h>
#include <CGAL/Uncertain.h>
#include <CGAL/Kernel_d/store_kernel.h>
#include <CGAL/NewKernel_d/store_kernel.h>
#include <CGAL/is_iterator.h>
#include <CGAL/iterator_from_indices.h>
#include <CGAL/number_utils.h>
#include <CGAL/Kernel/Return_base_tag.h>
#include <CGAL/transforming_iterator.h>
#include <CGAL/transforming_pair_iterator.h>
#include <CGAL/Kernel_d/functor_tags.h>
#include <CGAL/Kernel_d/functor_properties.h>
#include <CGAL/NewKernel_d/functor_tags.h>
#include <CGAL/NewKernel_d/functor_properties.h>
#include <CGAL/predicates/sign_of_determinant.h>
#include <functional>
#ifdef CGAL_CXX0X
@ -1091,5 +1091,5 @@ template<class R_> struct Has_on_positive_side : private Store_kernel<R_> {
CGAL_KD_DEFAULT_FUNCTOR(Has_on_positive_side_tag,(CartesianDKernelFunctors::Has_on_positive_side<K>),(),(Oriented_side_tag));
}
#include <CGAL/Kernel_d/Coaffine.h>
#include <CGAL/NewKernel_d/Coaffine.h>
#endif // CGAL_KERNEL_D_FUNCTION_OBJECTS_CARTESIAN_H

View File

@ -1,13 +1,13 @@
//#define BOOST_RESULT_OF_USE_DECLTYPE 1
#include <CGAL/Epick_d.h>
#include <typeinfo>
#include <CGAL/Kernel_d/Cartesian_base.h>
#include <CGAL/Kernel_d/Cartesian_static_filters.h>
#include <CGAL/Kernel_d/Cartesian_filter_NT.h>
#include <CGAL/Kernel_d/Cartesian_filter_K.h>
#include <CGAL/Kernel_d/Lazy_cartesian.h>
#include <CGAL/Kernel_d/Wrapper/Cartesian_wrap.h>
#include <CGAL/Kernel_d/Kernel_d_interface.h>
#include <CGAL/NewKernel_d/Cartesian_base.h>
#include <CGAL/NewKernel_d/Cartesian_static_filters.h>
#include <CGAL/NewKernel_d/Cartesian_filter_NT.h>
#include <CGAL/NewKernel_d/Cartesian_filter_K.h>
#include <CGAL/NewKernel_d/Lazy_cartesian.h>
#include <CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h>
#include <CGAL/NewKernel_d/Kernel_d_interface.h>
#include <CGAL/Gmpq.h>
#include <CGAL/Interval_nt.h>
#include <iostream>