From dd46cf820f9efabcef4a91da85a9a68a004a83c3 Mon Sep 17 00:00:00 2001
From: Lingjie Zhu <lingjie.zhu@nlpr.ia.ac.cn>
Date: Wed, 23 Aug 2017 00:53:12 +0800
Subject: [PATCH] fix initializer list order warning

---
 .../include/CGAL/VSA_approximation.h           | 18 ++++++++----------
 .../CGAL/vsa_mesh_approximation_metrics.h      |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
index 346b24bef50..8e2027414b1 100644
--- a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
+++ b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
@@ -141,6 +141,12 @@ class VSA_approximation {
   };
 
   // member variables
+  // The triangle mesh.
+  const TriangleMesh *m_pmesh;
+  // The error metric.
+  const ErrorMetric *fit_error;
+  // The proxy fitting functor.
+  const ProxyFitting *proxy_fitting;
 
   Construct_vector_3 vector_functor;
   Construct_scaled_vector_3 scale_functor;
@@ -155,13 +161,6 @@ class VSA_approximation {
   std::map<vertex_descriptor, int> vertex_int_map;
   VertexAnchorMap vanchor_map;
 
-  // The triangle mesh.
-  const TriangleMesh *m_pmesh;
-  // The error metric.
-  const ErrorMetric *fit_error;
-  // The proxy fitting functor.
-  const ProxyFitting *proxy_fitting;
-
   // Proxies.
   std::vector<Proxy> proxies;
   std::vector<Plane_3> px_planes;
@@ -187,9 +186,9 @@ public:
    * Default constructor.
    */
   VSA_approximation() :
+    m_pmesh(NULL),
     fit_error(NULL),
     proxy_fitting(NULL),
-    m_pmesh(NULL),
     seg_pmap(internal_fidx_map),
     vanchor_map(vertex_int_map) {
     GeomTraits traits;
@@ -206,9 +205,9 @@ public:
    */
   VSA_approximation(const ErrorMetric &_fit_error,
     const ProxyFitting &_proxy_fitting) :
+    m_pmesh(NULL),
     fit_error(&_fit_error),
     proxy_fitting(&_proxy_fitting),
-    m_pmesh(NULL),
     seg_pmap(internal_fidx_map),
     vanchor_map(vertex_int_map) {
     GeomTraits traits;
@@ -1211,7 +1210,6 @@ private:
     typedef typename boost::property_map<SubGraph, boost::vertex_index2_t>::type VertexIndex2Map;
     typedef typename boost::property_map<SubGraph, boost::edge_weight_t>::type EdgeWeightMap;
     typedef typename SubGraph::vertex_descriptor sg_vertex_descriptor;
-    typedef typename SubGraph::edge_descriptor sg_edge_descriptor;
     typedef std::vector<sg_vertex_descriptor> VertexVector;
 
     typedef std::map<vertex_descriptor, sg_vertex_descriptor> VertexMap;
diff --git a/Surface_mesh_approximation/include/CGAL/vsa_mesh_approximation_metrics.h b/Surface_mesh_approximation/include/CGAL/vsa_mesh_approximation_metrics.h
index 42bc643e17d..e5b3ad79538 100644
--- a/Surface_mesh_approximation/include/CGAL/vsa_mesh_approximation_metrics.h
+++ b/Surface_mesh_approximation/include/CGAL/vsa_mesh_approximation_metrics.h
@@ -392,10 +392,10 @@ public:
   }
 
 private:
+  const TriangleMesh *mesh;
   std::map<face_descriptor, FT> facet_areas;
   const FacetAreaMap area_pmap;
   const VertexPointMap point_pmap;
-  const TriangleMesh *mesh;
 };
 
 // specialization
@@ -451,10 +451,10 @@ public:
   }
 
 private:
+  const TriangleMesh *mesh;
   std::map<face_descriptor, FT> facet_areas;
   const FacetAreaMap area_pmap;
   const VertexPointMap point_pmap;
-  const TriangleMesh *mesh;
 };
 
 /**