From d96bdd9d4bab3d0d8a14d7d9cf6fb69a00a1bf42 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Wed, 17 Dec 2014 14:59:19 +0100 Subject: [PATCH] According the modifs in master, variables TRANSLATION ROTATION SCALING REFLECTION IDENTITY are always const. --- .../include/CGAL/aff_transformation_tags.h | 10 ++++----- .../CGAL/aff_transformation_tags_impl.h | 22 +++++-------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Kernel_23/include/CGAL/aff_transformation_tags.h b/Kernel_23/include/CGAL/aff_transformation_tags.h index ea25f0bf3ab..bfb773acb0d 100644 --- a/Kernel_23/include/CGAL/aff_transformation_tags.h +++ b/Kernel_23/include/CGAL/aff_transformation_tags.h @@ -38,11 +38,11 @@ class Identity_transformation {}; #ifndef CGAL_HEADER_ONLY -CGAL_EXPORT extern Translation TRANSLATION; -CGAL_EXPORT extern Rotation ROTATION; -CGAL_EXPORT extern Scaling SCALING; -CGAL_EXPORT extern Reflection REFLECTION; -CGAL_EXPORT extern Identity_transformation IDENTITY; +CGAL_EXPORT extern const Translation TRANSLATION; +CGAL_EXPORT extern const Rotation ROTATION; +CGAL_EXPORT extern const Scaling SCALING; +CGAL_EXPORT extern const Reflection REFLECTION; +CGAL_EXPORT extern const Identity_transformation IDENTITY; #endif diff --git a/Kernel_23/include/CGAL/aff_transformation_tags_impl.h b/Kernel_23/include/CGAL/aff_transformation_tags_impl.h index 5194c5f4645..d454b445653 100644 --- a/Kernel_23/include/CGAL/aff_transformation_tags_impl.h +++ b/Kernel_23/include/CGAL/aff_transformation_tags_impl.h @@ -24,22 +24,10 @@ namespace CGAL { -#ifdef CGAL_HEADER_ONLY - -const Translation TRANSLATION; -const Rotation ROTATION; -const Scaling SCALING; -const Reflection REFLECTION; -const Identity_transformation IDENTITY; - -#else // CGAL_HEADER_ONLY - -Translation TRANSLATION; -Rotation ROTATION; -Scaling SCALING; -Reflection REFLECTION; -Identity_transformation IDENTITY; - -#endif // CGAL_HEADER_ONLY +const Translation TRANSLATION = Translation(); +const Rotation ROTATION = Rotation(); +const Scaling SCALING = Scaling(); +const Reflection REFLECTION = Reflection(); +const Identity_transformation IDENTITY = Identity_transformation(); } //namespace CGAL