From 65569a9ff0c50365f6bf1a7fa0bbde6013bbba3f Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Tue, 4 Oct 2016 14:37:52 -0400 Subject: [PATCH] Start to rename Dart -> Combinatorial_map_dart and GMap_dart -> Generalized_map_dart --- .../include/CGAL/Combinatorial_map_dart.h | 18 +++++++++--------- .../include/CGAL/Combinatorial_map_min_items.h | 4 ++-- .../include/CGAL/Generalized_map_dart.h | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_dart.h b/Combinatorial_map/include/CGAL/Combinatorial_map_dart.h index 48496e33efa..33b377357a3 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_dart.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_dart.h @@ -17,8 +17,8 @@ // // Author(s) : Guillaume Damiand // -#ifndef CGAL_DART_H -#define CGAL_DART_H 1 +#ifndef CGAL_COMBINATORIAL_MAP_DART_H +#define CGAL_COMBINATORIAL_MAP_DART_H 1 #include #include @@ -27,7 +27,7 @@ namespace CGAL { - /** @file Dart.h + /** @file Combinatorial_map_dart.h * Definition of nD dart. */ @@ -42,14 +42,14 @@ namespace CGAL { #define CGAL_BETAINV(i) (i>1?i:(i==1?0:1)) /** Definition of nD dart. - * The Dart class describes an nD dart (basic element of a + * The Combinatorial_map_dart class describes an nD dart (basic element of a * combinatorial map). A dart is composed with handle towards its neighbors, * a bitset containing Boolean marks, and handle towards enabled attributes. * n is the dimension of the space (2 for 2D, 3 for 3D...) * Refs the ref class */ template - struct Dart + struct Combinatorial_map_dart { template < unsigned int, class, class, class, class > friend class Combinatorial_map_base; @@ -85,7 +85,7 @@ namespace CGAL { friend struct internal::Reverse_orientation_of_connected_component_functor; public: - typedef Dart Self; + typedef Combinatorial_map_dart Self; typedef typename Refs::Dart_handle Dart_handle; typedef typename Refs::size_type size_type; typedef typename Refs::Dart_const_handle Dart_const_handle; @@ -209,13 +209,13 @@ namespace CGAL { /** Default constructor: no real initialisation, * because this is done in the combinatorial map class. */ - Dart() + Combinatorial_map_dart() {} /** Copy constructor: * @param adart a dart. */ - Dart(const Dart& adart) : mmarks(adart.mmarks), + Combinatorial_map_dart(const Combinatorial_map_dart& adart) : mmarks(adart.mmarks), mattribute_handles(adart.mattribute_handles) { for (unsigned int i = 0; i <= dimension; ++i) @@ -241,5 +241,5 @@ namespace CGAL { } // namespace CGAL -#endif // CGAL_DART_H // +#endif // CGAL_COMBINATORIAL_MAP_DART_H // // EOF // diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h index 424361f3daf..df74c81bbde 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h @@ -20,7 +20,7 @@ #ifndef CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H #define CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H 1 -#include +#include namespace CGAL { @@ -39,7 +39,7 @@ namespace CGAL { template < class Refs > struct Dart_wrapper { - typedef CGAL::Dart< d, Refs > Dart; + typedef CGAL::Combinatorial_map_dart< d, Refs > Dart; typedef CGAL::cpp11::tuple<> Attributes; }; }; diff --git a/Generalized_map/include/CGAL/Generalized_map_dart.h b/Generalized_map/include/CGAL/Generalized_map_dart.h index 3fa08fc2ca1..00076b872f7 100644 --- a/Generalized_map/include/CGAL/Generalized_map_dart.h +++ b/Generalized_map/include/CGAL/Generalized_map_dart.h @@ -17,8 +17,8 @@ // // Author(s) : Guillaume Damiand // -#ifndef CGAL_GMAP_DART_H -#define CGAL_GMAP_DART_H 1 +#ifndef CGAL_GENERALIZED_MAP_DART_H +#define CGAL_GENERALIZED_MAP_DART_H 1 #include #include @@ -26,7 +26,7 @@ namespace CGAL { -/** @file GMap_dart.h +/** @file Generalized_map_dart.h * Definition of nD dart for generalized maps. */ @@ -39,14 +39,14 @@ namespace CGAL { } /** Definition of nD dart. - * The GMap_dart class describes an nD dart (basic element of a + * The Generalized_map_dart class describes an nD dart (basic element of a * generalized map). A dart is composed with handle towards its neighbors, * a bitset containing Boolean marks, and handle towards enabled attributes. * n is the dimension of the space (2 for 2D, 3 for 3D...) * Refs the ref class */ template -struct GMap_dart +struct Generalized_map_dart { template < unsigned int, class, class, class, class > friend class Generalized_map_base; @@ -73,7 +73,7 @@ struct GMap_dart friend struct internal::link_alpha_functor; public: - typedef GMap_dart Self; + typedef Generalized_map_dart Self; typedef typename Refs::Dart_handle Dart_handle; typedef typename Refs::size_type size_type; typedef typename Refs::Dart_const_handle Dart_const_handle; @@ -180,13 +180,13 @@ protected: /** Default constructor: no real initialisation, * because this is done in the generalized map class. */ - GMap_dart() + Generalized_map_dart() {} /** Copy constructor: * @param adart a dart. */ - GMap_dart(const GMap_dart& adart) : + Generalized_map_dart(const Generalized_map_dart& adart) : mmarks(adart.mmarks), mattribute_handles(adart.mattribute_handles) { @@ -213,5 +213,5 @@ protected: } // namespace CGAL -#endif // CGAL_GMAP_DART_H // +#endif // CGAL_GENERALIZED_MAP_DART_H // // EOF //