Revision: 9015
          http://playerstage.svn.sourceforge.net/playerstage/?rev=9015&view=rev
Author:   jpgr87
Date:     2010-12-30 02:05:37 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
Fixed typedef build error for OS X in ekfvloc driver

Modified Paths:
--------------
    code/player/trunk/server/drivers/localization/ekfvloc/transf.cc

Modified: code/player/trunk/server/drivers/localization/ekfvloc/transf.cc
===================================================================
--- code/player/trunk/server/drivers/localization/ekfvloc/transf.cc     
2010-12-30 02:04:21 UTC (rev 9014)
+++ code/player/trunk/server/drivers/localization/ekfvloc/transf.cc     
2010-12-30 02:05:37 UTC (rev 9015)
@@ -339,8 +339,8 @@
 
     gsl_matrix *m = gsl_matrix_alloc(M.RowNo(), M.ColNo());
 
-    for (uint r = 0; r < M.RowNo(); r++)
-        for (uint c = 0; c < M.ColNo(); c++)
+    for (uint32_t r = 0; r < M.RowNo(); r++)
+        for (uint32_t c = 0; c < M.ColNo(); c++)
             gsl_matrix_set(m, r, c, M(r, c));
 
     gsl_eigen_symmv_workspace *w = gsl_eigen_symmv_alloc(M.RowNo());
@@ -353,12 +353,12 @@
     {
         *values = Matrix(M.RowNo(), M.ColNo());
         (*values) *= 0;
-        for (uint r = 0; r < M.RowNo(); r++)
+        for (uint32_t r = 0; r < M.RowNo(); r++)
             (*values)(r, r) = gsl_vector_get(d, r);
 
         *vectors = Matrix(M.RowNo(), M.ColNo());
-        for (uint r = 0; r < M.RowNo(); r++)
-            for (uint c = 0; c < M.ColNo(); c++)
+        for (uint32_t r = 0; r < M.RowNo(); r++)
+            for (uint32_t c = 0; c < M.ColNo(); c++)
                 (*vectors)(r, c) = gsl_matrix_get(v, r, c);
     }
 
@@ -369,4 +369,4 @@
     
     if (err != 0)
         throw std::runtime_error(gsl_strerror(err));
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to