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

get rid of warnings

This commit is contained in:
Andreas Fabri 2014-12-11 12:54:48 +01:00
parent 21ba20df0c
commit 7d8f9ebe95
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
View File

@ -31,6 +31,12 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Triangulation_2/insert_constraints.h> #include <CGAL/Triangulation_2/insert_constraints.h>
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4355)
//warning C4355: 'this' : used in base member initializer list
#endif
namespace CGAL { namespace CGAL {
// Comparison functor that compares two Vertex_handle. // Comparison functor that compares two Vertex_handle.
@ -1185,4 +1191,7 @@ points_in_constraint_end(Constraint_id cid) const
} //namespace CGAL } //namespace CGAL
#if defined(BOOST_MSVC)
# pragma warning(pop)
#endif
#endif //CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H #endif //CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H

19
Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
View File

@ -208,9 +208,7 @@ public:
bool is_subconstrained_edge(T va, T vb) const; bool is_subconstrained_edge(T va, T vb) const;
bool is_constrained_edge(T va, T vb) const; bool is_constrained_edge(T va, T vb) const;
bool is_constrained_vertex(T v) const; bool is_constrained_vertex(T v) const;
bool vertices_in_constraint(Constraint hc,
Vertex_it& v_first,
Vertex_it& v_past) const;
Vertex_it vertices_in_constraint_begin(Constraint_id cid) const Vertex_it vertices_in_constraint_begin(Constraint_id cid) const
{ return cid.vl_ptr()->skip_begin(); } { return cid.vl_ptr()->skip_begin(); }
Vertex_it vertices_in_constraint_end(Constraint_id cid) const Vertex_it vertices_in_constraint_end(Constraint_id cid) const
@ -310,7 +308,7 @@ public:
template <class T, class Compare, class Data> template <class T, class Compare, class Data>
Polyline_constraint_hierarchy_2<T,Compare,Data>:: Polyline_constraint_hierarchy_2<T,Compare,Data>::
Polyline_constraint_hierarchy_2(const Polyline_constraint_hierarchy_2& ch) Polyline_constraint_hierarchy_2(const Polyline_constraint_hierarchy_2& ch)
: comp(comp) : comp(ch.comp)
, sc_to_c_map(Pair_compare(comp)) , sc_to_c_map(Pair_compare(comp))
, constraint_map(Pair_compare(comp)) , constraint_map(Pair_compare(comp))
{ {
@ -416,19 +414,6 @@ is_subconstrained_edge(T va, T vb) const
} }
template <class T, class Compare, class Data>
bool Polyline_constraint_hierarchy_2<T,Compare,Data>::
vertices_in_constraint(Constraint hc,
Vertex_it& v_first,
Vertex_it& v_past ) const
{
Sc_iterator sc_iter = sc_to_c_map.find(hc);
if( sc_iter == sc_to_c_map.end() )
return false;
v_first = (*sc_iter).second;
return true;
}
// af: obsolete // af: obsolete
template <class T, class Compare, class Data> template <class T, class Compare, class Data>
bool Polyline_constraint_hierarchy_2<T,Compare,Data>:: bool Polyline_constraint_hierarchy_2<T,Compare,Data>::