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

Removed some "p_" prefixes in variable names

This commit is contained in:
Clement Jamin 2013-07-12 15:49:45 +02:00
parent a664003024
commit 8aaee67985
10 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -449,8 +449,8 @@ protected:
typedef typename Tr::Facet Facet;
typedef typename Tr::Lock_data_structure Lock_data_structure;
C3T3_helpers_base(Lock_data_structure *p_lock_ds)
: m_lock_ds(p_lock_ds) {}
C3T3_helpers_base(Lock_data_structure *lock_ds)
: m_lock_ds(lock_ds) {}
public:
@ -646,8 +646,8 @@ public:
* Constructor
*/
C3T3_helpers(C3T3& c3t3, const MeshDomain& domain,
Lock_data_structure *p_lock_ds = 0)
: Base(p_lock_ds)
Lock_data_structure *lock_ds = 0)
: Base(lock_ds)
, c3t3_(c3t3)
, tr_(c3t3.triangulation())
, domain_(domain) { }

10
Mesh_3/include/CGAL/Mesh_3/Refine_cells_3.h
View File

@ -353,8 +353,8 @@ public:
const MeshDomain& oracle,
Previous_& previous,
C3T3& c3t3,
Lock_data_structure *p_lock_ds,
Mesh_3::WorksharingDataStructureType *p_worksharing_ds);
Lock_data_structure *lock_ds,
Mesh_3::WorksharingDataStructureType *worksharing_ds);
// Destructor
virtual ~Refine_cells_3() { }
@ -570,10 +570,10 @@ Refine_cells_3(Tr& triangulation,
const MD& oracle,
P_& previous,
C3T3& c3t3,
Lock_data_structure *p_lock_ds,
Mesh_3::WorksharingDataStructureType *p_worksharing_ds)
Lock_data_structure *lock_ds,
Mesh_3::WorksharingDataStructureType *worksharing_ds)
: Mesher_level<Tr, Self, Cell_handle, P_,
Triangulation_mesher_level_traits_3<Tr>, Ct >(previous, p_lock_ds, p_worksharing_ds)
Triangulation_mesher_level_traits_3<Tr>, Ct >(previous, lock_ds, worksharing_ds)
, C_()
, No_test_point_conflict()
, No_after_no_insertion()

12
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
View File

@ -411,8 +411,8 @@ public:
const MeshDomain& oracle,
Previous_level_& previous,
C3T3& c3t3,
Lock_data_structure *p_lock_ds,
Mesh_3::WorksharingDataStructureType *p_worksharing_ds);
Lock_data_structure *lock_ds,
Mesh_3::WorksharingDataStructureType *worksharing_ds);
/// Destructor
virtual ~Refine_facets_3() { }
@ -826,8 +826,8 @@ Refine_facets_3(Tr& triangulation,
const MD& oracle,
P_& previous,
C3T3& c3t3,
Lock_data_structure *p_lock_ds,
Mesh_3::WorksharingDataStructureType *p_worksharing_ds)
Lock_data_structure *lock_ds,
Mesh_3::WorksharingDataStructureType *worksharing_ds)
: Mesher_level<Tr, Self, Facet, P_,
Triangulation_mesher_level_traits_3<Tr>, Ct>(previous)
, C_()
@ -838,8 +838,8 @@ Refine_facets_3(Tr& triangulation,
, r_oracle_(oracle)
, r_c3t3_(c3t3)
{
Base::set_lock_ds(p_lock_ds);
Base::set_worksharing_ds(p_worksharing_ds);
Base::set_lock_ds(lock_ds);
Base::set_worksharing_ds(worksharing_ds);
}

8
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
View File

@ -103,12 +103,12 @@ typedef DelaunayTriangulationTraits_3::Object_3 Object;
/*!
Creates an empty Delaunay triangulation, possibly specifying a traits class
`traits`.
`p_lock_ds` is an optional pointer to the lock data structure for parallel operations. It
`lock_ds` is an optional pointer to the lock data structure for parallel operations. It
must be provided if concurrency is enabled.
*/
Delaunay_triangulation_3
(const DelaunayTriangulationTraits_3& traits = DelaunayTriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/*!
Copy constructor.
@ -124,14 +124,14 @@ traits class argument and calling `insert(first,last)`.
template < class InputIterator >
Delaunay_triangulation_3 (InputIterator first, InputIterator last,
const DelaunayTriangulationTraits_3& traits = DelaunayTriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/*!
Same as before, with last two parameters in reverse order.
*/
template < class InputIterator >
Delaunay_triangulation_3 (InputIterator first, InputIterator last,
SpatialLockDataStructure_3 *p_lock_ds,
SpatialLockDataStructure_3 *lock_ds,
const DelaunayTriangulationTraits_3& traits = DelaunayTriangulationTraits_3());
/// @}

8
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
View File

@ -72,12 +72,12 @@ typedef RegularTriangulationTraits_3::Weighted_point_3 Weighted_point;
/*!
Creates an empty regular triangulation, possibly specifying a traits class
`traits`.
`p_lock_ds` is an optional pointer to the lock data structure for parallel operations. It
`lock_ds` is an optional pointer to the lock data structure for parallel operations. It
must be provided if concurrency is enabled.
*/
Regular_triangulation_3
(const RegularTriangulationTraits_3 & traits = RegularTriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/*!
Copy constructor.
@ -95,14 +95,14 @@ traits class argument and calling `insert(first,last)`.
template < class InputIterator >
Regular_triangulation_3 (InputIterator first, InputIterator last,
const RegularTriangulationTraits_3& traits = RegularTriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/*!
Same as before, with last two parameters in reverse order.
*/
template < class InputIterator >
Regular_triangulation_3 (InputIterator first, InputIterator last,
SpatialLockDataStructure_3 *p_lock_ds,
SpatialLockDataStructure_3 *lock_ds,
const RegularTriangulationTraits_3& traits = RegularTriangulationTraits_3());
/// @}

10
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
View File

@ -218,18 +218,18 @@ typedef TriangulationDataStructure_3::Concurrency_tag Concurrency_tag;
/*!
Introduces a triangulation `t` having only one vertex which is the
infinite vertex.
`p_lock_ds` is an optional pointer to the lock data structure for parallel operations. It
`lock_ds` is an optional pointer to the lock data structure for parallel operations. It
must be provided if concurrency is enabled.
*/
Triangulation_3
(const TriangulationTraits_3 & traits = TriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/*!
Same as the previous one, but with parameters in reverse order.
*/
Triangulation_3
(SpatialLockDataStructure_3 *p_lock_ds = 0,
(SpatialLockDataStructure_3 *lock_ds = 0,
const TriangulationTraits_3 & traits = TriangulationTraits_3());
/*!
@ -246,7 +246,7 @@ traits class argument and calling `insert(first,last)`.
template < class InputIterator>
Triangulation_3 (InputIterator first, InputIterator last,
const TriangulationTraits_3 & traits = TriangulationTraits_3(),
SpatialLockDataStructure_3 *p_lock_ds = 0);
SpatialLockDataStructure_3 *lock_ds = 0);
/// @}
@ -1404,7 +1404,7 @@ ostream& operator<< (ostream& os, const Triangulation_3 &t);
/*!
Set the pointer to the lock data structure.
*/
void set_lock_data_structure(SpatialLockDataStructure_3 *p_lock_ds) const;
void set_lock_data_structure(SpatialLockDataStructure_3 *lock_ds) const;
/// @}

20
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -220,12 +220,12 @@ protected:
public:
Delaunay_triangulation_3(const Gt& gt = Gt(), Lock_data_structure *p_lock_ds = 0)
: Tr_Base(gt, p_lock_ds)
Delaunay_triangulation_3(const Gt& gt = Gt(), Lock_data_structure *lock_ds = 0)
: Tr_Base(gt, lock_ds)
{}
Delaunay_triangulation_3(Lock_data_structure *p_lock_ds, const Gt& gt = Gt())
: Tr_Base(p_lock_ds, gt)
Delaunay_triangulation_3(Lock_data_structure *lock_ds, const Gt& gt = Gt())
: Tr_Base(lock_ds, gt)
{}
// Create a 3D triangulation from 4 points which must be well-oriented
@ -233,8 +233,8 @@ public:
Delaunay_triangulation_3(const Point &p0, const Point &p1,
const Point &p2, const Point &p3,
const Gt& gt = Gt(),
Lock_data_structure *p_lock_ds = 0)
: Tr_Base(p0, p1, p2, p3, gt, p_lock_ds)
Lock_data_structure *lock_ds = 0)
: Tr_Base(p0, p1, p2, p3, gt, lock_ds)
{}
@ -247,17 +247,17 @@ public:
template < typename InputIterator >
Delaunay_triangulation_3(InputIterator first, InputIterator last,
const Gt& gt = Gt(), Lock_data_structure *p_lock_ds = 0)
: Tr_Base(gt, p_lock_ds)
const Gt& gt = Gt(), Lock_data_structure *lock_ds = 0)
: Tr_Base(gt, lock_ds)
{
insert(first, last);
}
template < typename InputIterator >
Delaunay_triangulation_3(InputIterator first, InputIterator last,
Lock_data_structure *p_lock_ds,
Lock_data_structure *lock_ds,
const Gt& gt = Gt())
: Tr_Base(gt, p_lock_ds)
: Tr_Base(gt, lock_ds)
{
insert(first, last);
}

16
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -153,12 +153,12 @@ namespace CGAL {
using Tr_Base::find_conflicts;
using Tr_Base::is_valid;
Regular_triangulation_3(const Gt & gt = Gt(), Lock_data_structure *p_lock_ds = 0)
: Tr_Base(gt, p_lock_ds), hidden_point_visitor(this)
Regular_triangulation_3(const Gt & gt = Gt(), Lock_data_structure *lock_ds = 0)
: Tr_Base(gt, lock_ds), hidden_point_visitor(this)
{}
Regular_triangulation_3(Lock_data_structure *p_lock_ds, const Gt & gt = Gt())
: Tr_Base(p_lock_ds, gt), hidden_point_visitor(this)
Regular_triangulation_3(Lock_data_structure *lock_ds, const Gt & gt = Gt())
: Tr_Base(lock_ds, gt), hidden_point_visitor(this)
{}
Regular_triangulation_3(const Regular_triangulation_3 & rt)
@ -170,16 +170,16 @@ namespace CGAL {
//insertion
template < typename InputIterator >
Regular_triangulation_3(InputIterator first, InputIterator last,
const Gt & gt = Gt(), Lock_data_structure *p_lock_ds = 0)
: Tr_Base(gt, p_lock_ds), hidden_point_visitor(this)
const Gt & gt = Gt(), Lock_data_structure *lock_ds = 0)
: Tr_Base(gt, lock_ds), hidden_point_visitor(this)
{
insert(first, last);
}
template < typename InputIterator >
Regular_triangulation_3(InputIterator first, InputIterator last,
Lock_data_structure *p_lock_ds, const Gt & gt = Gt())
: Tr_Base(gt, p_lock_ds), hidden_point_visitor(this)
Lock_data_structure *lock_ds, const Gt & gt = Gt())
: Tr_Base(gt, lock_ds), hidden_point_visitor(this)
{
insert(first, last);
}

24
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -184,8 +184,8 @@ protected:
Triangulation_3_base()
: m_lock_ds(0) {}
Triangulation_3_base(Lock_data_structure *p_lock_ds)
: m_lock_ds(p_lock_ds) {}
Triangulation_3_base(Lock_data_structure *lock_ds)
: m_lock_ds(lock_ds) {}
void swap(Triangulation_3_base<Parallel_tag, Lock_data_structure_> &tr)
{
@ -280,9 +280,9 @@ public:
return m_lock_ds;
}
void set_lock_data_structure(Lock_data_structure *p_lock_ds) const
void set_lock_data_structure(Lock_data_structure *lock_ds) const
{
m_lock_ds = p_lock_ds;
m_lock_ds = lock_ds;
}
void unlock_all_elements() const
@ -609,14 +609,14 @@ protected:
public:
// CONSTRUCTORS
Triangulation_3(const GT & gt = GT(), Lock_data_structure *p_lock_ds = 0)
: Base(p_lock_ds), _tds(), _gt(gt)
Triangulation_3(const GT & gt = GT(), Lock_data_structure *lock_ds = 0)
: Base(lock_ds), _tds(), _gt(gt)
{
init_tds();
}
Triangulation_3(Lock_data_structure *p_lock_ds, const GT & gt = GT())
: Base(p_lock_ds), _tds(), _gt(gt)
Triangulation_3(Lock_data_structure *lock_ds, const GT & gt = GT())
: Base(lock_ds), _tds(), _gt(gt)
{
init_tds();
}
@ -632,8 +632,8 @@ public:
template < typename InputIterator >
Triangulation_3(InputIterator first, InputIterator last,
const GT & gt = GT(), Lock_data_structure *p_lock_ds = 0)
: Base(p_lock_ds), _gt(gt)
const GT & gt = GT(), Lock_data_structure *lock_ds = 0)
: Base(lock_ds), _gt(gt)
{
init_tds();
insert(first, last);
@ -643,8 +643,8 @@ public:
// Precondition: p0, p1, p3 and p4 MUST BE positively oriented
Triangulation_3(const Point &p0, const Point &p1,
const Point &p3, const Point &p4,
const GT & gt = GT(), Lock_data_structure *p_lock_ds = 0)
: Base(p_lock_ds), _gt(gt)
const GT & gt = GT(), Lock_data_structure *lock_ds = 0)
: Base(lock_ds), _gt(gt)
{
CGAL_triangulation_precondition(orientation(p0, p1, p3, p4) == POSITIVE);
init_tds(p0, p1, p3, p4);

6
Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -475,14 +475,14 @@ public:
bool is_cell_locked_by_this_thread(const Cell_handle &cell_handle) const
{
CGAL::Spatial_grid_lock_data_structure_3<
Tag_priority_blocking> *p_lock_ds =
Tag_priority_blocking> *lock_ds =
CGAL::Spatial_grid_lock_data_structure_3::get_global_lock_ds();
bool locked = true;
if (p_lock_ds)
if (lock_ds)
{
for (int iVertex = 0 ; locked && iVertex < 4 ; ++iVertex)
{
locked = p_lock_ds->is_locked_by_this_thread(
locked = lock_ds->is_locked_by_this_thread(
cell_handle->vertex(iVertex)->point());
}
}