diff --git a/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp b/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp
index 07ebb5fba89..ed90d92cb6a 100644
--- a/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp
+++ b/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp
@@ -12,11 +12,10 @@ struct Sum_functor
   void operator()(Cell_attribute& ca1,Cell_attribute& ca2)
   { ca1.info()=ca1.info()+ca2.info(); }
 };
-template<typename CMap>
 struct Divide_by_two_functor
 {
   template<class Cell_attribute>
-  void operator()(CMap* amap, Cell_attribute& ca1,Cell_attribute& ca2)
+  void operator()(Cell_attribute& ca1,Cell_attribute& ca2)
   {
     ca1.info()=(ca1.info()/2);
     ca2.info()=(ca1.info());
@@ -30,8 +29,7 @@ struct Myitem
   {
     typedef CGAL::Dart<3, CMap> Dart;
     typedef CGAL::Cell_attribute<CMap, int, CGAL::Tag_true,
-     Sum_functor, Divide_by_two_functor<CMap> >
-    Facet_attribute;
+     Sum_functor, Divide_by_two_functor> Facet_attribute;
     typedef CGAL::cpp11::tuple<void,void,Facet_attribute> Attributes;
   };
 };
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h
index c41b6f7dc3b..db8eb7a12f6 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h
@@ -38,11 +38,6 @@
 
 #include <CGAL/config.h>
 
-// suppress bogus warning when compiling with gcc>=4.3
-#if CGAL_GCC_VERSION >= 40300
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-
 namespace CGAL {
 
   /** @file Combinatorial_map.h
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/Combinatorial_map_functors.h
index a1a97e693f4..ded6300aa5e 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_functors.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_functors.h
@@ -65,7 +65,7 @@ template<typename CMap>
 struct Display_attribute_functor
 {
   template <unsigned int i>
-  static void run(const CMap* amap,
+  static void run(const CMap* /*amap*/,
                   typename CMap::Dart_const_handle adart)
   {
     if ( adart->template attribute<i>()==NULL )
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_sewable.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_sewable.h
index c837e4ef7c2..a1627c5220c 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_sewable.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_sewable.h
@@ -156,7 +156,7 @@ struct Is_sewable_functor<CMap, 0, dim>
 template<typename CMap>
 struct Is_sewable_functor<CMap, 0, 1>
 {
-  static bool run( const CMap* amap,
+  static bool run( const CMap* /*amap*/,
                    typename CMap::Dart_const_handle adart1,
                    typename CMap::Dart_const_handle adart2 )
   {
diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h
index 2ade396c3cc..3712b983bcc 100644
--- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h
+++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h
@@ -28,18 +28,6 @@
 
 using namespace std;
 
-template<class Map>
-void drawCell2 ( Map& amap, typename Map::Dart_handle adart, int aorbit, int mark )
-{
-  /*    cout << "Orbite " << Map::ORBIT_NAME[aorbit] << " (";
-    CGAL::CMap_dart_iterator_basic_of_orbit_2<Map> it2 ( amap, adart, aorbit, mark );
-    for ( ;it2.cont(); ++it2 )
-    {
-        cout << ( *it2 )->vertex()->point() << ", ";
-    }
-    cout << ")" << flush;*/
-}
-
 template<class Map>
 void drawAllPoints( Map&amap )
 {
diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h
index 28e55a6b020..f788b5adecb 100644
--- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h
+++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h
@@ -59,18 +59,6 @@ bool check_number_of_cells_3(CMap& cmap, unsigned int nbv, unsigned int nbe,
   return true;
 }
 
-template<class Map>
-void drawCell3(Map& amap, typename Map::Dart_handle adart, int aorbit, int mark)
-{
-  cout << "Orbite " << Map::ORBIT_NAME[aorbit] << " (";
-  /*  CGAL::CMap_dart_iterator_basic_of_orbit_3<Map> it2(amap, adart, aorbit, mark);
-  for (;it2.cont(); ++it2)
-    {
-      cout << (*it2)->vertex()->point() << ", ";
-      }*/
-  cout << ")" << flush;
-}
-
 template<class Map, class Functor>
 void createAllBasicCases1()
 {