From f6244d769c6571e4d0fa46545a80ebf10e35e6e9 Mon Sep 17 00:00:00 2001 From: mfranz Date: Tue, 17 Oct 2006 20:39:00 +0000 Subject: [PATCH] Alexis Bory: revert hack; use correct type for string::find() --- src/Instrumentation/tacan.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx index 94c4caa56..b3668c336 100755 --- a/src/Instrumentation/tacan.cxx +++ b/src/Instrumentation/tacan.cxx @@ -341,7 +341,6 @@ TACAN::search (double frequency_mhz, double longitude_rad, = globals->get_carrierlist()->findStationByFreq( frequency_mhz ); bool freq_valid = (mobile_tacan != NULL); SG_LOG( SG_INSTR, SG_DEBUG, "mobile freqency valid " << freq_valid ); - _mobile_valid = false; if ( freq_valid ) { @@ -359,7 +358,7 @@ TACAN::search (double frequency_mhz, double longitude_rad, SG_LOG( SG_INSTR, SG_DEBUG, "carrier name " << str2 ); SG_LOG( SG_INSTR, SG_DEBUG, "strings 1 " << str1 << " 2 " << str2 ); - unsigned int loc1= str1.find( str2, 0 ); + string::size_type loc1= str1.find( str2, 0 ); if ( loc1 != string::npos && str2 != "" ) { SG_LOG( SG_INSTR, SG_DEBUG, " string found" ); _mobile_lat = carrier[i]->getDoubleValue("position/latitude-deg"); @@ -401,7 +400,7 @@ TACAN::search (double frequency_mhz, double longitude_rad, SG_LOG( SG_INSTR, SG_DEBUG, "tanker callsign " << str4 ); SG_LOG( SG_INSTR, SG_DEBUG, "strings 1 " << str1 << " 4 " << str4 ); - unsigned int loc1= str1.find( str4, 0 ); + string::size_type loc1= str1.find( str4, 0 ); if ( loc1 != string::npos && str4 != "" ) { SG_LOG( SG_INSTR, SG_DEBUG, " string found" ); _mobile_lat = tanker[i]->getDoubleValue("position/latitude-deg"); @@ -445,7 +444,7 @@ TACAN::search (double frequency_mhz, double longitude_rad, SG_LOG( SG_INSTR, SG_DEBUG, "mp tanker callsign " << str6 ); SG_LOG( SG_INSTR, SG_DEBUG, "strings 1 " << str1 << " 5 " << str6 ); - unsigned int loc1= str1.find( str6, 0 ); + string::size_type loc1= str1.find( str6, 0 ); if ( loc1 != string::npos && str6 != "" ) { SG_LOG( SG_INSTR, SG_DEBUG, " string found" ); _mobile_lat = mp_tanker[i]->getDoubleValue("position/latitude-deg"); -- 2.39.5