[Gearbox-commit] SF.net SVN: gearbox: [159] gearbox/trunk/src

[<rus...@us...>]

Revision: 159
          http://gearbox.svn.sourceforge.net/gearbox/?rev=159&view=rev
Author:   russo2503v
Date:     2008-06-05 18:33:29 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
using size_t instead of uint

Modified Paths:
--------------
    gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp
    gearbox/trunk/src/gbxsickacfr/driver.cpp
    gearbox/trunk/src/gbxsickacfr/messages.cpp

Modified: gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp
===================================================================
--- gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp	2008-06-05 08:38:13 UTC (rev 158)
+++ gearbox/trunk/src/gbxserialacfr/test/serialloopbacktest.cpp	2008-06-06 01:33:29 UTC (rev 159)
@@ -41,9 +41,9 @@
 
     gbxserialacfr::Serial serial( argv[1], atoi(argv[2]), gbxserialacfr::Serial::Timeout(1,0) );
 
-    const uint NUM_CHARS = 1000;
+    const int NUM_CHARS = 1000;
     std::vector<std::string> stringList = getStringList();
-    for ( uint i=0; i < NUM_CHARS; i++ )
+    for ( int i=0; i < NUM_CHARS; i++ )
     {
         int stringI = i % (stringList.size());
         std::string sendString = stringList[stringI]+"\n";

Modified: gearbox/trunk/src/gbxsickacfr/driver.cpp
===================================================================
--- gearbox/trunk/src/gbxsickacfr/driver.cpp	2008-06-05 08:38:13 UTC (rev 158)
+++ gearbox/trunk/src/gbxsickacfr/driver.cpp	2008-06-06 01:33:29 UTC (rev 159)
@@ -379,7 +379,7 @@
     if ( config_.baudRate != 38400 ) baudRates.push_back( 38400 );
     if ( config_.baudRate != 500000 ) baudRates.push_back( 500000 );
     
-    for ( uint baudRateI=0; baudRateI < baudRates.size(); baudRateI++ )
+    for ( size_t baudRateI=0; baudRateI < baudRates.size(); baudRateI++ )
     {
         stringstream ss;
         ss << "Driver: Trying to connect at " << baudRates[baudRateI] << " baud.";

Modified: gearbox/trunk/src/gbxsickacfr/messages.cpp
===================================================================
--- gearbox/trunk/src/gbxsickacfr/messages.cpp	2008-06-05 08:38:13 UTC (rev 158)
+++ gearbox/trunk/src/gbxsickacfr/messages.cpp	2008-06-06 01:33:29 UTC (rev 159)
@@ -608,7 +608,7 @@
 
     e->errorTypes.resize( len/2 );
     e->errorCodes.resize( len/2 );
-    for ( uint i=0; i < e->errorTypes.size(); i++ )
+    for ( size_t i=0; i < e->errorTypes.size(); i++ )
     {
         e->errorTypes[i] = buf[pos++];
         e->errorCodes[i] = buf[pos++];
@@ -624,7 +624,7 @@
     stringstream ss;
     ss << "num errors: " << errorTypes.size() << endl;
 
-    for ( uint i=0; i < errorTypes.size(); i++ )
+    for ( size_t i=0; i < errorTypes.size(); i++ )
     {
         ss << "    " << i << ": " << errorTypeToString(errorTypes[i]) << ": " << errorCodeToString(errorCodes[i]) << endl;
     }
@@ -636,7 +636,7 @@
 {
     assert( errorTypes.size() == errorCodes.size() );
 
-    for ( uint i=0; i < errorTypes.size(); i++ )
+    for ( size_t i=0; i < errorTypes.size(); i++ )
     {
         // Check for still-relevant errors
         if ( ! (errorTypes[i] & ERROR_TYPE_NO_LONGER_RELEVANT_MASK) )
@@ -654,7 +654,7 @@
 {
     assert( errorTypes.size() == errorCodes.size() );
 
-    for ( uint i=0; i < errorTypes.size(); i++ )
+    for ( size_t i=0; i < errorTypes.size(); i++ )
     {
         // Check for still-relevant errors
         if ( ! (errorTypes[i] & ERROR_TYPE_NO_LONGER_RELEVANT_MASK) )


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