]> git.mxchange.org Git - simgear.git/commitdiff
Fix two comparison between signed and unsigned integer warnings
authorErik Hofman <erik@ehofman.com>
Fri, 11 Dec 2015 10:09:39 +0000 (11:09 +0100)
committerErik Hofman <erik@ehofman.com>
Fri, 11 Dec 2015 10:09:39 +0000 (11:09 +0100)
simgear/io/HTTPClient.cxx
simgear/scene/tsync/terrasync.cxx

index 2a6d41e2feb92d511553107ce44bbdbe7306fc0c..302a01f0b3c0b384a287efa96953a2ada4fdb3ce 100644 (file)
@@ -1066,7 +1066,7 @@ size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems
       return byteSize; // skip headers associated with 100-continue status
   }
 
-  int colonPos = h.find(':');
+  size_t colonPos = h.find(':');
   if (colonPos == std::string::npos) {
       SG_LOG(SG_IO, SG_WARN, "malformed HTTP response header:" << h);
       return byteSize;
index c0b5b82c8825b656205972958a32dd7273656ebd..68f059d4f0cc9a6ef8a12e345af2503963ca98ce 100644 (file)
@@ -605,7 +605,7 @@ void SGTerraSync::SvnThread::updateSyncSlot(SyncSlot &slot)
     if (slot.repository.get()) {
         if (slot.repository->isDoingSync()) {
 #if 1
-            if (slot.stamp.elapsedMSec() > slot.nextWarnTimeout) {
+            if (slot.stamp.elapsedMSec() > (int)slot.nextWarnTimeout) {
                 SG_LOG(SG_TERRAIN, SG_INFO, "sync taking a long time:" << slot.currentItem._dir << " taken " << slot.stamp.elapsedMSec());
                 SG_LOG(SG_TERRAIN, SG_INFO, "HTTP status:" << _http.hasActiveRequests());
                 slot.nextWarnTimeout += 10000;
@@ -1085,4 +1085,4 @@ bool SGTerraSync::isDataDirPending(const std::string& dataDir) const
 void SGTerraSync::reposition()
 {
     // stub, remove
-}
\ No newline at end of file
+}