diff --git a/owlps-positioning/TODO b/owlps-positioning/TODO
index dfac2e9..9fb24ac 100644
--- a/owlps-positioning/TODO
+++ b/owlps-positioning/TODO
@@ -1,7 +1,4 @@
 
-- const_iterator
-   Utiliser const_iterator quand on ne modifie pas la valeur pointée.
-
 - InputCSV
    ° Différencier une requête normale d'une requête de calibration, en
    utilisant les champs de direction.
diff --git a/owlps-positioning/building.cc b/owlps-positioning/building.cc
index 215bb31..293629b 100644
--- a/owlps-positioning/building.cc
+++ b/owlps-positioning/building.cc
@@ -34,12 +34,13 @@ Building::Building(const Building &b)
 Building::~Building()
 {
   // Empty Area list
-  for (vector<Area*>::iterator i = areas.begin() ; i != areas.end() ; ++i)
+  for (vector<Area*>::const_iterator i = areas.begin() ;
+       i != areas.end() ; ++i)
     delete *i ;
   areas.clear() ;
 
   // Empty Waypoint list
-  for (vector<Waypoint*>::iterator i = waypoints.begin() ;
+  for (vector<Waypoint*>::const_iterator i = waypoints.begin() ;
        i != waypoints.end() ; ++i)
     {
       // Delete current waypoint only if it is not linked to another building
diff --git a/owlps-positioning/inputcsv.cc b/owlps-positioning/inputcsv.cc
index 5fed729..51372d1 100644
--- a/owlps-positioning/inputcsv.cc
+++ b/owlps-positioning/inputcsv.cc
@@ -121,7 +121,7 @@ const Request& InputCSV::get_next_request()
   tokenizer<escaped_list_separator<char> > tok(
     current_line, escaped_list_separator<char>('\\', ';', '\"')) ;
 
-  tokenizer<escaped_list_separator<char> >::iterator ti(tok.begin()) ;
+  tokenizer<escaped_list_separator<char> >::const_iterator ti(tok.begin()) ;
 
   // Read Mobile MAC field
   if (ti == tok.end())
diff --git a/owlps-positioning/measurement.cc b/owlps-positioning/measurement.cc
index 8f97303..00b53d7 100644
--- a/owlps-positioning/measurement.cc
+++ b/owlps-positioning/measurement.cc
@@ -52,7 +52,7 @@ void Measurement::update_average_ss()
 {
   average_ss = 0 ;
 
-  for (vector<int>::iterator i = ss_list.begin() ;
+  for (vector<int>::const_iterator i = ss_list.begin() ;
        i != ss_list.end() ; ++i)
     {
       float ss_mwatts =
diff --git a/owlps-positioning/stock.cc b/owlps-positioning/stock.cc
index fbd4e1b..2ea0dd1 100644
--- a/owlps-positioning/stock.cc
+++ b/owlps-positioning/stock.cc
@@ -29,7 +29,7 @@ unordered_map<string, AccessPoint> Stock::aps =
  */
 const Mobile& Stock::get_mobile(const string &mac)
 {
-  unordered_map<string, Mobile>::iterator i = mobiles.find(mac) ;
+  unordered_map<string, Mobile>::const_iterator i = mobiles.find(mac) ;
   if (i != mobiles.end())
     return i->second ;
   throw out_of_range("No Mobile with MAC address « " + mac + " »!") ;
@@ -45,7 +45,7 @@ const Mobile& Stock::get_mobile(const string &mac)
  */
 const AccessPoint& Stock::get_ap(const string &mac)
 {
-  unordered_map<string, AccessPoint>::iterator i = aps.find(mac) ;
+  unordered_map<string, AccessPoint>::const_iterator i = aps.find(mac) ;
   if (i != aps.end())
     return i->second ;
   throw out_of_range("No AccessPoint with MAC address « " + mac + " »!") ;