From 01b81c5bcb8522197d9ba2e4c8dcbe548ad1980a Mon Sep 17 00:00:00 2001
From: Clement Jamin <clement.jamin@inria.fr>
Date: Tue, 8 Jul 2014 16:17:51 +0200
Subject: [PATCH] Fix GCC compilation

---
 .../include/CGAL/Mesh_complex_3_in_triangulation_3.h | 12 ++++++++----
 Mesh_3/include/CGAL/refine_mesh_3.h                  |  4 ++--
 Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h    |  2 +-
 Mesh_3/test/Mesh_3/test_c3t3.cpp                     |  5 +++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
index ffb0de11bae..0205a07fe66 100644
--- a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
+++ b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
@@ -63,12 +63,16 @@ public:
   
   typedef typename Tr::Point                              Point;
   typedef typename Base::Edge                             Edge;
+  typedef typename Base::Facet                            Facet;
   typedef typename Base::Vertex_handle                    Vertex_handle;
+  typedef typename Base::Cell_handle                      Cell_handle;
   typedef CornerIndex                                     Corner_index;
   typedef CurveSegmentIndex                               Curve_segment_index;
 
   typedef typename Base::Triangulation                    Triangulation;
 
+  using Base::surface_patch_index;
+
 private:
   // Type to store the edges:
   //  - a set of std::pair<Vertex_handle,Vertex_handle> (ordered at insertion)
@@ -219,16 +223,16 @@ public:
   {
     Triangulation &tr = triangulation();
     //triangulation().remove(far_vertices_.begin(), far_vertices_.end());
-    Far_vertices_vec::const_iterator it = far_vertices_.begin();
-    Far_vertices_vec::const_iterator it_end = far_vertices_.end();
+    typename Far_vertices_vec::const_iterator it = far_vertices_.begin();
+    typename Far_vertices_vec::const_iterator it_end = far_vertices_.end();
     for ( ; it != it_end ; ++it)
     {
       std::vector<Cell_handle> new_cells;
       new_cells.reserve(32);
       tr.remove_and_give_new_cells(*it, std::back_inserter(new_cells));
 
-      std::vector<Cell_handle>::iterator nc_it = new_cells.begin();
-      std::vector<Cell_handle>::iterator nc_it_end = new_cells.end();
+      typename std::vector<Cell_handle>::iterator nc_it = new_cells.begin();
+      typename std::vector<Cell_handle>::iterator nc_it_end = new_cells.end();
       for ( ; nc_it != nc_it_end ; ++nc_it)
       {
         Cell_handle c = *nc_it;
diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h
index ec861a810d0..17c63c9c449 100644
--- a/Mesh_3/include/CGAL/refine_mesh_3.h
+++ b/Mesh_3/include/CGAL/refine_mesh_3.h
@@ -73,14 +73,14 @@ namespace CGAL {
 
 #if defined(CGAL_LINKED_WITH_TBB)\
  && !defined(CGAL_PARALLEL_MESH_3_DO_NOT_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE)
-        if (boost::is_convertible<C3T3::Concurrency_tag, CGAL::Parallel_tag>::value)
+        if (boost::is_convertible<typename C3T3::Concurrency_tag, CGAL::Parallel_tag>::value)
         {
           if (dimension == -1)
             r_c3t3_.add_far_point(new_vertex);
         }
 #endif
 #ifdef CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE
-        if (boost::is_convertible<C3T3::Concurrency_tag, CGAL::Sequential_tag>::value)
+        if (boost::is_convertible<typename C3T3::Concurrency_tag, CGAL::Sequential_tag>::value)
         {
           if (dimension == -1)
             r_c3t3_.add_far_point(new_vertex);
diff --git a/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h b/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
index 4028cf0fa6a..a9640579b8f 100644
--- a/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
+++ b/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
@@ -35,7 +35,7 @@ namespace Mesh_3 {
 ************************************************/
 
 // Sequential
-template <typename C3T3, typename Concurrency_tag = C3T3::Concurrency_tag>
+template <typename C3T3, typename Concurrency_tag = typename C3T3::Concurrency_tag>
 class Remove_far_points
 {
 #ifdef CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE
diff --git a/Mesh_3/test/Mesh_3/test_c3t3.cpp b/Mesh_3/test/Mesh_3/test_c3t3.cpp
index 893f399a0c6..c5d4d132e08 100644
--- a/Mesh_3/test/Mesh_3/test_c3t3.cpp
+++ b/Mesh_3/test/Mesh_3/test_c3t3.cpp
@@ -385,5 +385,10 @@ int main()
   Tester<K_e_e> test_epec;
   test_epec();
 
+  int *p = new int;
+  *p = 18;
+  std::cout << *p << std::endl;
+  p = 0;
+
   return EXIT_SUCCESS;
 }