songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use two different names for copy, const and non const version, to avoid ambiguity on windows (internal undocumented methods)

This commit is contained in:
Guillaume Damiand 2020-04-21 10:07:53 +02:00
parent e09c0d7794
commit 9838b9debc
3 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -235,7 +235,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
this->clear();
@ -271,7 +271,7 @@ namespace CGAL {
new_dart=mdarts.emplace();
init_dart(new_dart); // , amap.get_marks(it));
if (mark_perforated!=NB_MARKS && amap.is_perforated(it))
if (mark_perforated!=INVALID_MARK && amap.is_perforated(it))
{ mark(new_dart, mark_perforated); }
(*origin_to_copy)[it]=new_dart;
@ -329,7 +329,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
generic_copy<CMap2, typename CMap2::Dart_handle, Converters,
DartInfoConverter, PointConverter>
@ -338,10 +338,10 @@ namespace CGAL {
copy_perforated_darts, mark_perforated);
}
// (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
// (1b) copy_from_const(const amap, converters, dartinfoconverter, pointconverter)
template<typename CMap2, typename Converters, typename DartInfoConverter,
typename PointConverter>
void copy(const CMap2& amap,
void copy_from_const(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
@ -350,7 +350,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
generic_copy<CMap2, typename CMap2::Dart_const_handle, Converters,
DartInfoConverter, PointConverter>
@ -369,7 +369,7 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
pointconverter;
@ -378,9 +378,9 @@ namespace CGAL {
copy_perforated_darts, mark_perforated);
}
// (2b) copy(const amap, converters, dartinfoconverter)
// (2b) copy_from_const(const amap, converters, dartinfoconverter)
template <typename CMap2, typename Converters, typename DartInfoConverter>
void copy(const CMap2& amap,
void copy_from_const(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
@ -388,11 +388,11 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
pointconverter;
copy(amap, origin_to_copy, copy_to_origin,
copy_from_const(amap, origin_to_copy, copy_to_origin,
converters, dartinfoconverter, pointconverter,
copy_perforated_darts, mark_perforated);
}
@ -406,26 +406,26 @@ namespace CGAL {
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
const Converters& converters,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_perforated_darts, mark_perforated);
}
// (3b) copy(const amap, converters)
// (3b) copy_from_const(const amap, converters)
template <typename CMap2, typename Converters>
void copy(const CMap2& amap,
void copy_from_const(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_from_const(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_perforated_darts, mark_perforated);
}
@ -437,38 +437,38 @@ namespace CGAL {
boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
CGAL::cpp11::tuple<> converters;
copy(amap, origin_to_copy, copy_to_origin, converters,
copy_perforated_darts, mark_perforated);
}
// (4b) copy(const amap)
// (4b) copy_from_const(const amap)
template <typename CMap2>
void copy(const CMap2& amap,
void copy_from_const(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
CGAL::cpp11::tuple<> converters;
copy(amap, origin_to_copy, copy_to_origin, converters,
copy_from_const(amap, origin_to_copy, copy_to_origin, converters,
copy_perforated_darts, mark_perforated);
}
// Copy constructor from a map having exactly the same type.
Combinatorial_map_base (const Self & amap): Combinatorial_map_base()
{ copy(amap); }
{ copy_from_const(amap); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
typename Storage2>
Combinatorial_map_base(const Combinatorial_map_base<d2, Refs2, Items2,
Alloc2, Storage2>& amap): Combinatorial_map_base()
{ copy(amap); }
{ copy_from_const(amap); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -477,7 +477,7 @@ namespace CGAL {
Alloc2, Storage2>& amap,
const Converters& converters):
Combinatorial_map_base()
{ copy(amap, nullptr, nullptr, converters); }
{ copy_from_const(amap, nullptr, nullptr, converters); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -487,7 +487,7 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter):
Combinatorial_map_base()
{ copy(amap, nullptr, nullptr, converters, dartinfoconverter); }
{ copy_from_const(amap, nullptr, nullptr, converters, dartinfoconverter); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -500,7 +500,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter):
Combinatorial_map_base()
{ copy(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
{ copy_from_const(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
/** Affectation operation. Copies one map to the other.
* @param amap a combinatorial map.
@ -561,7 +561,7 @@ namespace CGAL {
typename boost::graph_traits<HEG>::halfedge_descriptor>*
copy_to_origin=NULL,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
// Create an mapping between darts of the two maps (originals->copies).
// (here we cannot use CGAL::Unique_hash_map because it does not provide
@ -581,7 +581,7 @@ namespace CGAL {
{
new_dart=mdarts.emplace();
if (mark_perforated!=NB_MARKS && CGAL::is_border(*it, heg))
if (mark_perforated!=INVALID_MARK && CGAL::is_border(*it, heg))
{ mark(new_dart, mark_perforated); }
(*origin_to_copy)[*it]=new_dart;

52
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -201,7 +201,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
this->clear();
@ -235,7 +235,7 @@ namespace CGAL {
new_dart=mdarts.emplace();
init_dart(new_dart); //, amap.get_marks(it));
if (mark_perforated!=NB_MARKS && amap.is_perforated(it))
if (mark_perforated!=INVALID_MARK && amap.is_perforated(it))
{ mark(new_dart, mark_perforated); }
(*origin_to_copy)[it]=new_dart;
@ -293,7 +293,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
generic_copy<GMap2, typename GMap2::Dart_handle, Converters,
DartInfoConverter, PointConverter>
@ -302,10 +302,10 @@ namespace CGAL {
copy_perforated_darts, mark_perforated);
}
// (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
// (1b) copy_from_const(const amap, converters, dartinfoconverter, pointconverter)
template<typename GMap2, typename Converters, typename DartInfoConverter,
typename PointConverter>
void copy(const GMap2& amap,
void copy_from_const(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
@ -314,7 +314,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
generic_copy<GMap2, typename GMap2::Dart_const_handle,
Converters, DartInfoConverter, PointConverter>
@ -333,7 +333,7 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
pointconverter;
@ -342,9 +342,9 @@ namespace CGAL {
copy_perforated_darts, mark_perforated);
}
// (2b) copy(const amap, converters, dartinfoconverter)
// (2b) copy_from_const(const amap, converters, dartinfoconverter)
template <typename GMap2, typename Converters, typename DartInfoConverter>
void copy(const GMap2& amap,
void copy_from_const(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
@ -352,11 +352,11 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
pointconverter;
copy(amap, origin_to_copy, copy_to_origin, converters,
copy_from_const(amap, origin_to_copy, copy_to_origin, converters,
dartinfoconverter, pointconverter,
copy_perforated_darts, mark_perforated);
}
@ -370,26 +370,26 @@ namespace CGAL {
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
const Converters& converters,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_perforated_darts, mark_perforated);
}
// (3b) copy(const amap, converters)
// (3b) copy_from_const(const amap, converters)
template <typename GMap2, typename Converters>
void copy(const GMap2& amap,
void copy_from_const(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_from_const(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter,
copy_perforated_darts, mark_perforated);
}
@ -401,45 +401,45 @@ namespace CGAL {
boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
CGAL::cpp11::tuple<> converters;
copy(amap, origin_to_copy, copy_to_origin, converters,
copy_perforated_darts, mark_perforated);
}
// (4b) copy(const amap)
// (4b) copy_from_const(const amap)
template <typename GMap2>
void copy(const GMap2& amap,
void copy_from_const(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr,
bool copy_perforated_darts=false,
size_type mark_perforated=NB_MARKS)
size_type mark_perforated=INVALID_MARK)
{
CGAL::cpp11::tuple<> converters;
copy(amap, origin_to_copy, copy_to_origin, converters,
copy_from_const(amap, origin_to_copy, copy_to_origin, converters,
copy_perforated_darts, mark_perforated);
}
// Copy constructor from a map having exactly the same type.
Generalized_map_base(const Self & amap) : Generalized_map_base()
{ copy(amap); }
{ copy_from_const(amap); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
typename Storage2>
Generalized_map_base(const Generalized_map_base<d2, Refs2, Items2, Alloc2, Storage2>& amap):
Generalized_map_base()
{ copy(amap); }
{ copy_from_const(amap); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
typename Storage2, typename Converters>
Generalized_map_base(const Generalized_map_base<d2, Refs2, Items2, Alloc2, Storage2>& amap,
const Converters& converters): Generalized_map_base()
{ copy(amap, nullptr, nullptr, converters); }
{ copy_from_const(amap, nullptr, nullptr, converters); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -449,7 +449,7 @@ namespace CGAL {
const Converters& converters,
const DartInfoConverter& dartinfoconverter):
Generalized_map_base()
{ copy(amap, nullptr, nullptr, converters, dartinfoconverter); }
{ copy_from_const(amap, nullptr, nullptr, converters, dartinfoconverter); }
// "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -461,7 +461,7 @@ namespace CGAL {
const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter):
Generalized_map_base()
{ copy(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
{ copy_from_const(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
/** Affectation operation. Copies one map to the other.
* @param amap a generalized map.

4
Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h
View File

@ -52,7 +52,7 @@ namespace internal {
Copy_to_origin_map& copy_to_origin,
typename Generic_map::size_type mark_perforated)
{
target.copy(source, &origin_to_copy, &copy_to_origin, true, mark_perforated);
target.copy_from_const(source, &origin_to_copy, &copy_to_origin, true, mark_perforated);
}
};
@ -71,7 +71,7 @@ namespace internal {
Origin_to_copy_map& origin_to_copy, Copy_to_origin_map& copy_to_origin,
typename Generic_map::size_type mark_perforated)
{
target.copy(source, &origin_to_copy, &copy_to_origin, true, mark_perforated);
target.copy_from_const(source, &origin_to_copy, &copy_to_origin, true, mark_perforated);
}
};