From 7d8f9ebe95920eb6fd64152bc7de9747bb206cc0 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 11 Dec 2014 12:54:48 +0100
Subject: [PATCH] get rid of warnings

---
 .../Polyline_constrained_triangulation_2.h    |  9 +++++++++
 .../CGAL/Polyline_constraint_hierarchy_2.h    | 19 ++-----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
index a017d13915d..9cf91d257bb 100644
--- a/Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
@@ -31,6 +31,12 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.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 {
 
 // Comparison functor that compares two Vertex_handle.
@@ -1185,4 +1191,7 @@ points_in_constraint_end(Constraint_id cid) const
 
 } //namespace CGAL
 
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
 #endif //CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H
diff --git a/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
index 3fdbf0ec36c..61ddbd117be 100644
--- a/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
@@ -208,9 +208,7 @@ public:
   bool is_subconstrained_edge(T va, T vb) const;
   bool is_constrained_edge(T va, T vb) 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
   { return cid.vl_ptr()->skip_begin(); }
   Vertex_it vertices_in_constraint_end(Constraint_id cid) const
@@ -310,7 +308,7 @@ public:
 template <class T, class Compare, class Data>
 Polyline_constraint_hierarchy_2<T,Compare,Data>::
 Polyline_constraint_hierarchy_2(const Polyline_constraint_hierarchy_2& ch)
-  : comp(comp)
+  : comp(ch.comp)
   , sc_to_c_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
 template <class T, class Compare, class Data>
 bool Polyline_constraint_hierarchy_2<T,Compare,Data>::