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

remove extra ;

This commit is contained in:
Daniel Russel 2010-06-01 15:22:32 +00:00
parent 8948095088
commit afb06904f4
25 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h
View File

@ -68,14 +68,14 @@ protected:
typedef Active_objects_vector<Value_t> This;
typedef std::pair<Key, Value_t> Storage_item;
typedef std::vector<Storage_item > Storage;
CGAL_KINETIC_MULTILISTENER1(IS_EDITING);
CGAL_KINETIC_MULTILISTENER1(IS_EDITING)
public:
//! default constructor
Active_objects_vector():editing_(false), num_valid_(false){}
~Active_objects_vector(){CGAL_KINETIC_MULTILISTENER_DESTRUCTOR}
~Active_objects_vector(){CGAL_KINETIC_MULTILISTENER_DESTRUCTOR;}
//! access a point
const Data &operator[](Key key) const

8
Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Kinetic/Ref_counted.h>
#include <CGAL/Kinetic/Multi_listener.h>
CGAL_KINETIC_BEGIN_NAMESPACE;
CGAL_KINETIC_BEGIN_NAMESPACE
#ifdef CGAL_KINETIC_CHECK_EXPENSIVE
#ifndef CGAL_KINETIC_DISABLE_AUDITING
@ -645,7 +645,7 @@ protected:
typedef enum {}
Notification_type;
};*/
CGAL_KINETIC_MULTILISTENER2(HAS_AUDIT_TIME, DIRECTION_OF_TIME);
CGAL_KINETIC_MULTILISTENER2(HAS_AUDIT_TIME, DIRECTION_OF_TIME)
protected:
Queue queue_;
@ -730,8 +730,8 @@ void Default_simulator<S, PQ>::audit_all_kdss()
CGAL_OUTPUT2(Default_simulator);
CGAL_OUTPUT2(Default_simulator)
CGAL_KINETIC_END_NAMESPACE;
CGAL_KINETIC_END_NAMESPACE
#endif

2
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h
View File

@ -152,7 +152,7 @@ public:
typedef typename CGAL::Kinetic::Active_objects_batch_listener_helper<typename Moving_point_table::Listener, This> Moving_point_table_listener;
friend class CGAL::Kinetic::Active_objects_batch_listener_helper<typename Moving_point_table::Listener, This>;*/
CGAL_KINETIC_DECLARE_BATCH_LISTENERS(typename Simulator,
typename Moving_point_table);
typename Moving_point_table)
/*struct Compare_edges{
bool operator()(const Edge &a, const Edge &b) const {

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h
View File

@ -125,7 +125,7 @@ private:
typedef internal::Delaunay_triangulation_base_3<Base_traits, Visitor> KDel;
CGAL_KINETIC_DECLARE_LISTENERS(typename TraitsT::Simulator,
typename TraitsT::Active_points_3_table);
typename TraitsT::Active_points_3_table)
public:
//! Initialize it.
@ -205,7 +205,7 @@ public:
CGAL_KINETIC_LISTENER1(TRIANGULATION);
CGAL_KINETIC_LISTENER1(TRIANGULATION)
void on_geometry_changed() {
CGAL_KINETIC_NOTIFY(TRIANGULATION);

4
Kinetic_data_structures/include/CGAL/Kinetic/Handle_degeneracy_function_kernel.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/Kinetic/internal/debug_counters.h>
CGAL_KINETIC_BEGIN_NAMESPACE;
CGAL_KINETIC_BEGIN_NAMESPACE
template <class Traits_t, bool SLOPPY>
@ -117,5 +117,5 @@ std::ostream &operator<<(std::ostream &out, const HDRS<T, SLOPPY> &k) {
return k.write(out);
}
CGAL_KINETIC_END_NAMESPACE;
CGAL_KINETIC_END_NAMESPACE
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Heap_pointer_event_queue.h
View File

@ -70,7 +70,7 @@ private:
Priority time_;
};
CGAL_OUTPUT1(Heap_pointer_event_queue_item);
CGAL_OUTPUT1(Heap_pointer_event_queue_item)
template <class Priority>
@ -87,7 +87,7 @@ public:
Heap_pointer_event_queue_item_handle(const P&p): P(p){}
};
CGAL_OUTPUT1(Heap_pointer_event_queue_item_handle);
CGAL_OUTPUT1(Heap_pointer_event_queue_item_handle)
// The how a dummy item is stored in the ::Heap_pointer_event_queue
/*

4
Kinetic_data_structures/include/CGAL/Kinetic/Insert_event.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/internal/To_static.h>
#include <CGAL/Kinetic/Event_base.h>
CGAL_KINETIC_BEGIN_NAMESPACE;
CGAL_KINETIC_BEGIN_NAMESPACE
//! An event to insert a single object into a MovingObjectTable
@ -62,5 +62,5 @@ std::ostream &operator<<(std::ostream &out, const Insert_event< MH> &moi)
}
CGAL_KINETIC_END_NAMESPACE;
CGAL_KINETIC_END_NAMESPACE
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Listener.h
View File

@ -233,7 +233,7 @@ private: \
#define CGAL_KINETIC_NOTIFY(field) if (listener_!= NULL) listener_->new_notification(Listener::field)
#define CGAL_KINETIC_LISTENER_DESTRUCTOR CGAL_assertion(listener_==NULL);
#define CGAL_KINETIC_LISTENER_DESTRUCTOR CGAL_assertion(listener_==NULL)
#define CGAL_KINETIC_LISTENER_BASICS(Name, KDS) \
@ -274,7 +274,7 @@ private: \
else { \
} \
} \
}; \
}; \
friend class Notifier##_listener; \
Notifier##_listener listener_##Notifier##_;

10
Kinetic_data_structures/include/CGAL/Kinetic/Multi_listener.h
View File

@ -137,7 +137,7 @@ private: \
}; \
public: \
typedef CGAL::Kinetic::Multi_listener_base<Listener_core> Listener; \
friend class CGAL::Kinetic::Multi_listener_base<Listener_core>; \
friend class CGAL::Kinetic::Multi_listener_base<Listener_core>; \
private: \
void new_listener(Listener *sk) { \
listeners_.push_back(sk); \
@ -226,10 +226,12 @@ private: \
} \
std::vector<Listener*> listeners_;
#define CGAL_KINETIC_MULTINOTIFY(field) for(typename std::vector<Listener*>::iterator it= listeners_.begin(); it != listeners_.end(); ++it){ \
#define CGAL_KINETIC_MULTINOTIFY(field) do { \
for(typename std::vector<Listener*>::iterator it= listeners_.begin(); it != listeners_.end(); ++it){ \
(*it)->new_notification(Listener::field); \
}
}} while (false)
#define CGAL_KINETIC_MULTILISTENER_DESTRUCTOR CGAL_assertion(listeners_.empty())
#define CGAL_KINETIC_MULTILISTENER_DESTRUCTOR CGAL_assertion(listeners_.empty());
CGAL_KINETIC_END_NAMESPACE
#endif

2
Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
View File

@ -435,7 +435,7 @@ protected:
typedef internal::Delaunay_triangulation_base_3<Base_traits, Delaunay_visitor> KDel;
CGAL_KINETIC_DECLARE_LISTENERS(typename TraitsT::Simulator,
typename Traits::Active_points_3_table);
typename Traits::Active_points_3_table)
public:

2
Kinetic_data_structures/include/CGAL/Kinetic/Sort.h
View File

@ -118,7 +118,7 @@ template <class Traits, class Visitor=Sort_visitor_base> class Sort:
friend class Swap_event<This,iterator, typename KLess::result_type>;
// Redirects the Simulator notifications to function calls
CGAL_KINETIC_DECLARE_LISTENERS(typename Traits::Simulator,
typename Active_objects_table);
typename Active_objects_table)
public:
// Register this KDS with the MovingObjectTable and the Simulator

4
Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <functional>
CGAL_KINETIC_BEGIN_NAMESPACE;
CGAL_KINETIC_BEGIN_NAMESPACE
//! An object to help convert between moving objects and their static representations to wrap a predicate.
/*! A ref counted pointer is stored to the part of the
@ -165,5 +165,5 @@ protected:
Kinetic_predicate kpred_;
};
CGAL_KINETIC_END_NAMESPACE;
CGAL_KINETIC_END_NAMESPACE
#endif

2
Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_1.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <iostream>
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE;
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class Coordinate_t>
class Cartesian_moving_point_1

2
Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_2.h
View File

@ -24,7 +24,7 @@
#include <iostream>
#include <CGAL/Point_2.h>
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE;
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class Coordinate_t>
class Cartesian_moving_point_2

4
Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <iostream>
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE;
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class Coordinate_t>
class Cartesian_moving_point_3
@ -198,7 +198,7 @@ std::istream &operator>>(std::istream &in,
}
CGAL_KINETIC_END_INTERNAL_NAMESPACE;
CGAL_KINETIC_END_INTERNAL_NAMESPACE
/*CGAL_KINETIC_BEGIN_NAMESPACE;

4
Kinetic_data_structures/include/CGAL/Kinetic/internal/Kernel/Cartesian_moving_weighted_point_3.h
View File

@ -24,7 +24,7 @@
#include <iostream>
#include <CGAL/Kinetic/internal/Kernel/Cartesian_moving_point_3.h>
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE;
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
template <class Coordinate_t>
class Cartesian_moving_weighted_point_3
@ -147,7 +147,7 @@ std::istream &operator>>(std::istream &in,
}
CGAL_KINETIC_END_INTERNAL_NAMESPACE;
CGAL_KINETIC_END_INTERNAL_NAMESPACE
/*CGAL_KINETIC_BEGIN_NAMESPACE;

2
Kinetic_data_structures/include/CGAL/Kinetic/internal/triangulation_helpers_3.h
View File

@ -94,7 +94,7 @@ bool has_degree_3(const T&t, const typename T::Edge &e)
} while (ccir != ecir);
bool ret=( degree==3);
return ret;
};
}
template <class Tr>
bool has_degree_4(const Tr &t, const typename Tr::Vertex_handle vh)

18
Kinetic_data_structures/include/CGAL/Kinetic/listeners.h
View File

@ -41,7 +41,7 @@ class Simulator_listener: public SL
{
typedef SL P;
public:
CGAL_KINETIC_LISTENER_BASICS(Simulator_listener, KDS);
CGAL_KINETIC_LISTENER_BASICS(Simulator_listener, KDS)
//! Pass HAS_AUDIT_TIME notifications via a call to the audit() function
void new_notification(typename P::Notification_type t) {
@ -74,7 +74,7 @@ class Active_objects_listener: public Moving_object_table_listener
typedef typename Moving_object_table_listener::Notifier_handle::element_type MOT;
typedef Moving_object_table_listener P;
public:
CGAL_KINETIC_LISTENER_BASICS(Active_objects_listener, KDS);
CGAL_KINETIC_LISTENER_BASICS(Active_objects_listener, KDS)
public:
//! Pass EDITING notifications
/*! When editing changes to false, call new_object, changed_object,
@ -131,7 +131,7 @@ class Active_objects_batch_listener: public Moving_object_table_listener
typedef typename Moving_object_table_listener::Notifier_handle::element_type MOT;
typedef Moving_object_table_listener P;
public:
CGAL_KINETIC_LISTENER_BASICS(Active_objects_batch_listener, KDS);
CGAL_KINETIC_LISTENER_BASICS(Active_objects_batch_listener, KDS)
//! Pass EDITING notifications
/*! When editing changes to false, call new_object, changed_object,
deleted_object for each new, changed or deleted object in the
@ -175,24 +175,24 @@ public:
typedef typename CGAL::Kinetic::Active_objects_listener<A::Listener, This> Moving_point_table_listener; \
friend class CGAL::Kinetic::Active_objects_listener<A::Listener, This>; \
Simulator_listener siml_;\
Moving_point_table_listener motl_;
Moving_point_table_listener motl_;
#define CGAL_KINETIC_DECLARE_AOT_LISTENER(A) private: \
typedef typename CGAL::Kinetic::Active_objects_listener<A::Listener, This> Moving_point_table_listener; \
friend class CGAL::Kinetic::Active_objects_listener<A::Listener, This>; \
Moving_point_table_listener motl_;
Moving_point_table_listener motl_;
#define CGAL_KINETIC_INITIALIZE_LISTENERS(sh, ph) \
siml_.set_recipient(this); siml_.set_notifier(sh); \
motl_.set_recipient(this); motl_.set_notifier(ph); \
motl_.catch_up();
motl_.catch_up()
#define CGAL_KINETIC_INITIALIZE_AOT_LISTENER(ph) \
motl_.set_recipient(this); motl_.set_notifier(ph); \
motl_.catch_up();
motl_.catch_up()
#define CGAL_KINETIC_DECLARE_BATCH_LISTENERS(S, A) private: \
@ -201,12 +201,12 @@ public:
typedef typename CGAL::Kinetic::Active_objects_batch_listener<A::Listener, This> Moving_point_table_listener; \
friend class CGAL::Kinetic::Active_objects_batch_listener<A::Listener, This>;\
Simulator_listener siml_; \
Moving_point_table_listener motl_;
Moving_point_table_listener motl_;
#define CGAL_KINETIC_INITIALIZE_BATCH_LISTENERS(sh, ph, insert) \
siml_.set_recipient(this); siml_.set_notifier(sh); \
motl_.set_recipient(this); motl_.set_notifier(ph); \
if (insert) motl_.catch_up();
if (insert) motl_.catch_up()
CGAL_KINETIC_END_NAMESPACE
#endif

40
Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
View File

@ -23,21 +23,21 @@
#define CGAL_UTILITY_MACROS_H
#define CGAL_SUBSCRIPT(type, expr) type& operator[](unsigned int i){ expr;} \
const type& operator[](unsigned int i) const { expr;}
const type& operator[](unsigned int i) const { expr;}
#define CGAL_COPY_CONSTRUCTOR(TC) TC(const TC &o){copy_from(o);}\
TC& operator=(const TC &o) {copy_from(o); return *this;}
TC& operator=(const TC &o) {copy_from(o); return *this;}
//
#define CGAL_GET(type, name, expr) const type & name() const{expr;}
#define CGAL_GETOBJECT(UC, lc, expr) const UC& lc##_object() const {expr;}
#define CGAL_GETNR(type, name, expr) type name() const{expr;}
#define CGAL_GET(type, name, expr) const type & name() const{expr;}
#define CGAL_GETOBJECT(UC, lc, expr) const UC& lc##_object() const {expr;}
#define CGAL_GETNR(type, name, expr) type name() const{expr;}
//#define CGAL_GET(type, name, expr) typename boost::call_traits<type>::param_type name() const {expr;}
#define CGAL_IS(name, expr) bool is_##name() const {expr;}
#define CGAL_SET_IS(name, expr) void set_is_##name(bool tf) {expr;}
#define CGAL_IS(name, expr) bool is_##name() const {expr;}
#define CGAL_SET_IS(name, expr) void set_is_##name(bool tf) {expr;}
#define CGAL_SET(type, name, expr) void set_##name(const type &k) {expr;}
#define CGAL_SET(type, name, expr) void set_##name(const type &k) {expr;}
#define CGAL_GETSET(type, name, var) \
CGAL_GET(type, name, return var) \
@ -46,7 +46,8 @@
#define CGAL_OUTPUT(type) \
inline std::ostream& operator<<(std::ostream&out, const type &t){ \
return t.write(out); \
}
} \
CGAL_REQUIRE_SEMICOLON_NAMESPACE
#define CGAL_OUTPUT1(type) \
template <class A> \
@ -70,7 +71,6 @@
return uc_name##_consts(const_it_type(bexpr), const_it_type(eexpr)); \
}
#define CGAL_CONST_ITERATOR(uc_name, lc_name, it_type, bexpr, eexpr) \
typedef boost::iterator_range< it_type > uc_name##s; \
uc_name##s lc_name##s() const { \
@ -113,10 +113,10 @@
#define CGAL_INSERT(ucname, expr) \
void insert(ucname##_key k, const ucname &m) {expr;}
void insert(ucname##_key k, const ucname &m) {expr;}
#define CGAL_INSERTNK(ucname, expr) \
void insert(const ucname &m) {expr;}
void insert(const ucname &m) {expr;}
#define CGAL_SWAP(type) \
inline void swap(type &a, type &b) { \
@ -133,7 +133,7 @@
template <class A, class B> \
inline void swap(type<A,B> &a, type<A,B> &b) { \
a.swap_with(b); \
}
}
#define CGAL_ISWAP(name) \
std::swap(name, o.name)
@ -159,7 +159,7 @@ template <class A, class B> \
} \
bool operator<=(const This &o) const { \
return compare(o) != CGAL::LARGER; \
}
}
#define CGAL_COMPARISONS_COMPARE bool operator==(const This &o) const { \
return compare(o)==0; \
@ -178,7 +178,8 @@ template <class A, class B> \
} \
bool operator<=(const This &o) const { \
return compare(o) <= 0; \
}
}
#define CGAL_COMPARISONS1(field) bool operator==(const This &o) const { \
@ -198,7 +199,8 @@ template <class A, class B> \
} \
bool operator<=(const This &o) const { \
return (field<= o.field); \
}
}
@ -223,7 +225,8 @@ template <class A, class B> \
} \
bool operator<=(const This &o) const { \
return !operator>(o); \
}
}
#define CGAL_COMPARISONS3(a, b, c) \
bool operator==(const This &o) const { \
@ -253,6 +256,7 @@ template <class A, class B> \
return !operator>(o); \
}
#define CGAL_REAL_EMBEDDABLE_BODY \
class Abs \
: public std::unary_function< Type, Type > { \
@ -333,7 +337,7 @@ template <class A, class B> \
static const bool is_modulo= false; \
static const bool traps = false; \
static const bool tinyness_before =false; \
static const float_round_style round_stype = round_toward_zero \
static const float_round_style round_stype = round_toward_zero; \
#define CGAL_REAL_EMBEDDABLE1(name) \

2
Kinetic_data_structures/test/Kinetic_data_structures/Delaunay_triangulation_2.cpp
View File

@ -90,4 +90,4 @@ int main(int, char *[])
if (CGAL::Kinetic::internal::audit_failures__ != 0 ) return EXIT_FAILURE;
else return EXIT_SUCCESS;
};
}

2
Kinetic_data_structures/test/Kinetic_data_structures/Delaunay_triangulation_3.cpp
View File

@ -113,4 +113,4 @@ int main(int argc, char *argv[])
if (CGAL::Kinetic::internal::audit_failures__ != 0 ) return EXIT_FAILURE;
else return EXIT_SUCCESS;
};
}

2
Kinetic_data_structures/test/Kinetic_data_structures/instantaneous_kernel.cpp
View File

@ -54,4 +54,4 @@ int main(int, char *[])
return 0;
};
}

2
Kinetic_data_structures/test/Kinetic_data_structures/numeric_kds.cpp
View File

@ -58,4 +58,4 @@ int main(int argc, char *argv[])
else {*/
return EXIT_SUCCESS;
//}
};
}

2
Kinetic_data_structures/test/Kinetic_data_structures/regular_triangulation_3.cpp
View File

@ -261,4 +261,4 @@ int main(int argc, char *argv[])
if (CGAL::Kinetic::internal::audit_failures__ != 0) return EXIT_FAILURE;
else return EXIT_SUCCESS;
}
};
}

2
Kinetic_data_structures/test/Kinetic_data_structures/timings.cpp
View File

@ -206,4 +206,4 @@ int main(/* int argc, char *argv[] */)
<< CGAL::POLYNOMIAL::lazy_stats.isolated_ << " "
<< CGAL::POLYNOMIAL::lazy_stats.refine_attempted_ << " "
<< CGAL::POLYNOMIAL::lazy_stats.refine_succeeded_ << std::endl; */
};
}