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

extra run of the script to remove tabs and trailing whitespaces

This commit is contained in:
Sébastien Loriot 2020-03-26 19:26:37 +01:00
parent 34ce87be56
commit 97e46accad
10 changed files with 566 additions and 566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h
View File

@ -8,7 +8,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_X_TRAPEZOID_H #ifndef CGAL_TD_X_TRAPEZOID_H
@ -380,7 +380,7 @@ public:
(on_right_bndry ? CGAL_TD_ON_RIGHT_BOUNDARY : 0) | (on_right_bndry ? CGAL_TD_ON_RIGHT_BOUNDARY : 0) |
(on_bottom_bndry ? CGAL_TD_ON_BOTTOM_BOUNDARY : 0) | (on_bottom_bndry ? CGAL_TD_ON_BOTTOM_BOUNDARY : 0) |
(on_top_bndry ? CGAL_TD_ON_TOP_BOUNDARY : 0) ), (on_top_bndry ? CGAL_TD_ON_TOP_BOUNDARY : 0) ),
lb, lt, rb, rt); lb, lt, rb, rt);
m_dag_node = node; m_dag_node = node;
} }
@ -401,8 +401,8 @@ public:
*/ */
CGAL_TD_INLINE Self& operator= (const Self& t2) CGAL_TD_INLINE Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */
@ -674,7 +674,7 @@ public:
bool is_active() const bool is_active() const
{ {
return rb()!= return rb()!=
(Self*)CGAL_TD_DELETE_SIGNATURE; (Self*)CGAL_TD_DELETE_SIGNATURE;
} }
/*! Removing this trapezoid (defining it as in-active) */ /*! Removing this trapezoid (defining it as in-active) */
@ -719,15 +719,15 @@ public:
bool on_right_boundary = right.is_on_right_boundary(); bool on_right_boundary = right.is_on_right_boundary();
*this = Self (!is_on_left_boundary() ? & left() : 0, *this = Self (!is_on_left_boundary() ? & left() : 0,
!on_right_boundary ? &right.right() : 0, !on_right_boundary ? &right.right() : 0,
!is_on_bottom_boundary() ? &bottom() : 0, !is_on_bottom_boundary() ? &bottom() : 0,
!is_on_top_boundary() ? &top() : 0, !is_on_top_boundary() ? &top() : 0,
CGAL_TD_TRAPEZOID, CGAL_TD_TRAPEZOID,
is_on_left_boundary(), on_right_boundary, is_on_left_boundary(), on_right_boundary,
is_on_bottom_boundary(), is_on_top_boundary(), is_on_bottom_boundary(), is_on_top_boundary(),
lb(),lt(), lb(),lt(),
right.rb(), right.rb(),
right.rt()); right.rt());
if (rb()) if (rb())
rb()->set_lb(this); rb()->set_lb(this);

6
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h
View File

@ -7,7 +7,7 @@
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_ACTIVE_EDGE_H #ifndef CGAL_TD_ACTIVE_EDGE_H
@ -226,8 +226,8 @@ public:
*/ */
CGAL_TD_INLINE Self& operator= (const Self& t2) CGAL_TD_INLINE Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */

6
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_trapezoid.h
View File

@ -7,7 +7,7 @@
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_ACTIVE_TRAPEZOID_H #ifndef CGAL_TD_ACTIVE_TRAPEZOID_H
@ -297,8 +297,8 @@ private:
*/ */
inline Self& operator= (const Self& t2) inline Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */

16
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag.h
View File

@ -78,14 +78,14 @@ protected:
node(const T& e, const Td_dag_handle& left, node(const T& e, const Td_dag_handle& left,
const Td_dag_handle& right,unsigned long _depth=0) : const Td_dag_handle& right,unsigned long _depth=0) :
data(e),leftPtr(left),rightPtr(right),depth_(_depth){} data(e),leftPtr(left),rightPtr(right),depth_(_depth){}
// node(const T& e) : data(e),leftPtr(),rightPtr(){} // node(const T& e) : data(e),leftPtr(),rightPtr(){}
// node(const T& e, const Td_dag_handle& left, // node(const T& e, const Td_dag_handle& left,
// const Td_dag_handle& right) : data(e),leftPtr(left),rightPtr(right) {} // const Td_dag_handle& right) : data(e),leftPtr(left),rightPtr(right) {}
~node(){} ~node(){}
bool is_inner_node() const {return !!leftPtr && !!rightPtr;} bool is_inner_node() const {return !!leftPtr && !!rightPtr;}
bool visited() const {return visited_;} bool visited() const {return visited_;}
protected: protected:
T data; // information stored in node T data; // information stored in node
Td_dag_handle leftPtr,rightPtr; Td_dag_handle leftPtr,rightPtr;
mutable unsigned long depth_; mutable unsigned long depth_;
mutable bool visited_; mutable bool visited_;
@ -154,7 +154,7 @@ public:
/* dynamic management ---------*/ /* dynamic management ---------*/
/* description: /* description:
Shallow copy */ Shallow copy */
Self& operator=(const Self& b) Self& operator=(const Self& b)
{ {
Handle::operator=(b); Handle::operator=(b);
@ -198,14 +198,14 @@ public:
{ {
if (!operator!()) if (!operator!())
{ {
// create dummy Td_dag // create dummy Td_dag
T tmp; T tmp;
Self dummy(tmp); Self dummy(tmp);
// detach right son,redirect to dummy // detach right son,redirect to dummy
set_right(dummy); set_right(dummy);
// set right son pointer to 0 // set right son pointer to 0
ptr()->rightPtr.PTR.p=0; ptr()->rightPtr.PTR.p=0;
// delete dummy Td_dag // delete dummy Td_dag
delete dummy.ptr(); delete dummy.ptr();
} }
} }

6
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h
View File

@ -7,7 +7,7 @@
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_INACTIVE_EDGE_H #ifndef CGAL_TD_INACTIVE_EDGE_H
@ -180,8 +180,8 @@ public:
*/ */
inline Self& operator= (const Self& t2) inline Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */

8
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h
View File

@ -7,7 +7,7 @@
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_INACTIVE_FICTITIOUS_VERTEX_H #ifndef CGAL_TD_INACTIVE_FICTITIOUS_VERTEX_H
@ -135,7 +135,7 @@ public:
Data* ptr() const { return (Data*)(PTR.p); } Data* ptr() const { return (Data*)(PTR.p); }
Curve_end vtx_to_ce(Vertex_const_handle v) const Curve_end vtx_to_ce(Vertex_const_handle v) const
{ {
//the circulator is of incoming halfedges //the circulator is of incoming halfedges
Halfedge_around_vertex_const_circulator he = v->incident_halfedges(); Halfedge_around_vertex_const_circulator he = v->incident_halfedges();
@ -206,8 +206,8 @@ public:
*/ */
inline Self& operator= (const Self& t2) inline Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */

6
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h
View File

@ -7,7 +7,7 @@
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// Author(s) : Oren Nechushtan <theoren@math.tau.ac.il> // Author(s) : Oren Nechushtan <theoren@math.tau.ac.il>
// updated by: Michal Balas <balasmic@post.tau.ac.il> // updated by: Michal Balas <balasmic@post.tau.ac.il>
#ifndef CGAL_TD_INACTIVE_VERTEX_H #ifndef CGAL_TD_INACTIVE_VERTEX_H
@ -182,8 +182,8 @@ public:
*/ */
inline Self& operator= (const Self& t2) inline Self& operator= (const Self& t2)
{ {
Handle::operator=(t2); Handle::operator=(t2);
return *this; return *this;
} }
/*! Operator==. */ /*! Operator==. */

34
Filtered_kernel/include/CGAL/Lazy.h
View File

@ -284,14 +284,14 @@ public:
os << std::endl; os << std::endl;
if(! is_lazy()){ if(! is_lazy()){
for(int i = 0; i < level; i++){ for(int i = 0; i < level; i++){
os << " "; os << " ";
} }
os << "Exact: "; os << "Exact: ";
print_at(os, *et); print_at(os, *et);
os << std::endl; os << std::endl;
#ifdef CGAL_LAZY_KERNEL_DEBUG_SHOW_TYPEID #ifdef CGAL_LAZY_KERNEL_DEBUG_SHOW_TYPEID
for(int i = 0; i < level; i++){ for(int i = 0; i < level; i++){
os << " "; os << " ";
} }
os << " (type: " << typeid(*et).name() << ")" << std::endl; os << " (type: " << typeid(*et).name() << ")" << std::endl;
#endif // CGAL_LAZY_KERNEL_DEBUG_SHOW_TYPEID #endif // CGAL_LAZY_KERNEL_DEBUG_SHOW_TYPEID
@ -927,7 +927,7 @@ struct Ith {
typedef std::pair<T2,std::pair<bool,bool> > Pair_type_2; typedef std::pair<T2,std::pair<bool,bool> > Pair_type_2;
if(const Pair_type_1 *p1 = object_cast<Pair_type_1>(&v[i])) if(const Pair_type_1 *p1 = object_cast<Pair_type_1>(&v[i]))
return p1->first; return p1->first;
else if(const Pair_type_2 *p2 = object_cast<Pair_type_2>(&v[i])) else if(const Pair_type_2 *p2 = object_cast<Pair_type_2>(&v[i]))
return p2->first; return p2->first;
@ -1176,11 +1176,11 @@ public:
for (unsigned int i = 0; i < lv.approx().size(); i++) { for (unsigned int i = 0; i < lv.approx().size(); i++) {
// FIXME : I'm not sure how this work... // FIXME : I'm not sure how this work...
#define CGAL_Kernel_obj(X) if (object_cast<typename AK::X>(& (lv.approx()[i]))) { \ #define CGAL_Kernel_obj(X) if (object_cast<typename AK::X>(& (lv.approx()[i]))) { \
*it++ = make_object(typename LK::X(new Lazy_rep_n<typename AK::X, typename EK::X, Ith<typename AK::X>, \ *it++ = make_object(typename LK::X(new Lazy_rep_n<typename AK::X, typename EK::X, Ith<typename AK::X>, \
Ith<typename EK::X>, E2A, Lazy_vector> \ Ith<typename EK::X>, E2A, Lazy_vector> \
(Ith<typename AK::X>(i), Ith<typename EK::X>(i), lv))); \ (Ith<typename AK::X>(i), Ith<typename EK::X>(i), lv))); \
continue; \ continue; \
} }
#include <CGAL/Kernel/interface_macros.h> #include <CGAL/Kernel/interface_macros.h>
@ -1194,9 +1194,9 @@ public:
std::vector<Object> exact_objects; std::vector<Object> exact_objects;
ec(CGAL::exact(l1), CGAL::exact(l2), std::back_inserter(exact_objects)); ec(CGAL::exact(l1), CGAL::exact(l2), std::back_inserter(exact_objects));
for (std::vector<Object>::const_iterator oit = exact_objects.begin(); for (std::vector<Object>::const_iterator oit = exact_objects.begin();
oit != exact_objects.end(); oit != exact_objects.end();
++oit){ ++oit){
*it++ = make_lazy<LK>(*oit); *it++ = make_lazy<LK>(*oit);
} }
} }
return it; return it;
@ -1255,9 +1255,9 @@ public:
#define CGAL_Kernel_obj(X) \ #define CGAL_Kernel_obj(X) \
if (object_cast<typename AK::X>(& (lo.approx()))) { \ if (object_cast<typename AK::X>(& (lo.approx()))) { \
typedef Lazy_rep_n< typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \ typedef Lazy_rep_n< typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \
Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \ Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \
return make_object(typename LK::X(lcr)); \ return make_object(typename LK::X(lcr)); \
} }
#include <CGAL/Kernel/interface_macros.h> #include <CGAL/Kernel/interface_macros.h>
@ -1288,9 +1288,9 @@ public:
#define CGAL_Kernel_obj(X) \ #define CGAL_Kernel_obj(X) \
if (object_cast<typename AK::X>(& (lo.approx()))) { \ if (object_cast<typename AK::X>(& (lo.approx()))) { \
typedef Lazy_rep_n<typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \ typedef Lazy_rep_n<typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \
Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \ Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \
return make_object(typename LK::X(lcr)); \ return make_object(typename LK::X(lcr)); \
} }
#include <CGAL/Kernel/interface_macros.h> #include <CGAL/Kernel/interface_macros.h>
@ -1342,9 +1342,9 @@ CGAL_Kernel_obj(Point_3)
#define CGAL_Kernel_obj(X) \ #define CGAL_Kernel_obj(X) \
if (object_cast<typename AK::X>(& (lo.approx()))) { \ if (object_cast<typename AK::X>(& (lo.approx()))) { \
typedef Lazy_rep_n<typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \ typedef Lazy_rep_n<typename AK::X, typename EK::X, Object_cast<typename AK::X>, Object_cast<typename EK::X>, E2A, Lazy_object> Lcr; \
Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \ Lcr * lcr = new Lcr(Object_cast<typename AK::X>(), Object_cast<typename EK::X>(), lo); \
return make_object(typename LK::X(lcr)); \ return make_object(typename LK::X(lcr)); \
} }
#include <CGAL/Kernel/interface_macros.h> #include <CGAL/Kernel/interface_macros.h>

8
STL_Extension/include/CGAL/Handle.h
View File

@ -40,7 +40,7 @@ class Handle
typedef std::ptrdiff_t Id_type ; typedef std::ptrdiff_t Id_type ;
Handle() noexcept Handle() noexcept
: PTR{static_cast<Rep*>(0)} {} : PTR{static_cast<Rep*>(0)} {}
// FIXME: if the precondition throws in a noexcept function, the program terminates // FIXME: if the precondition throws in a noexcept function, the program terminates
Handle(const Handle& x) noexcept Handle(const Handle& x) noexcept
@ -53,8 +53,8 @@ class Handle
~Handle() ~Handle()
{ {
if ( PTR.p && (--PTR.p->count == 0)) if ( PTR.p && (--PTR.p->count == 0))
delete PTR.p; delete PTR.p;
} }
Handle& Handle&
@ -63,7 +63,7 @@ class Handle
CGAL_precondition( x.PTR.p != static_cast<Rep*>(0) ); CGAL_precondition( x.PTR.p != static_cast<Rep*>(0) );
x.PTR.p->count++; x.PTR.p->count++;
if ( PTR.p && (--PTR.p->count == 0)) if ( PTR.p && (--PTR.p->count == 0))
delete PTR.p; delete PTR.p;
PTR.p = x.PTR.p; PTR.p = x.PTR.p;
return *this; return *this;
} }