kopia lustrzana https://github.com/jamescoxon/dl-fldigi
rodzic
c0a7cff119
commit
55e0d31b88
|
@ -683,7 +683,9 @@ class KmlSrvImpl : public KmlServer {
|
|||
/// and different positions due to a move. This has to be very fast because under lock protection.
|
||||
void FlushQueue(double merge_dist) {
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("FlushQueue nbelts %d sz=%d", m_queue_to_insert.size(), size() );
|
||||
LOG_INFO("FlushQueue nbelts %d sz=%d",
|
||||
static_cast<int>(m_queue_to_insert.size()),
|
||||
static_cast<int>(size()) );
|
||||
|
||||
if( m_queue_to_insert.empty() ) return ;
|
||||
|
||||
|
@ -692,7 +694,7 @@ class KmlSrvImpl : public KmlServer {
|
|||
DirectInsert( *itPL, merge_dist );
|
||||
}
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("Flushed into sz=%d", size() );
|
||||
LOG_INFO("Flushed into sz=%d", static_cast<int>(size()) );
|
||||
|
||||
// TODO: If lock contention problems, we might swap this list with another one owned by this
|
||||
// objet. This would later be merged into the container before saving data to disk.
|
||||
|
@ -1384,7 +1386,7 @@ class KmlSrvImpl : public KmlServer {
|
|||
bool RewriteKmlFileFull(void) {
|
||||
bool wasSaved = false ;
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("nb_categories=%d", nb_categories );
|
||||
LOG_INFO("nb_categories=%d", static_cast<int>(nb_categories) );
|
||||
for( size_t i = 0; i < nb_categories; ++i ) {
|
||||
const char * category = categories[i];
|
||||
PlacesMapT *ptrMap = m_placemarks.FindCategory( category );
|
||||
|
|
|
@ -591,7 +591,8 @@ public:
|
|||
|
||||
// First take the names
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
|
||||
LOG_INFO("Eliminating duplicates out of %d elements",
|
||||
static_cast<int>(m_catalog.size()));
|
||||
for( IteratorType it = m_catalog.begin(), en = m_catalog.end(); it != en; ++it )
|
||||
{
|
||||
RecordWmoStation & refWmo = it->second ;
|
||||
|
@ -613,14 +614,19 @@ public:
|
|||
++nbKeys;
|
||||
}
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
|
||||
LOG_INFO("Name=%s nb=%d",
|
||||
itH->first.c_str(),
|
||||
static_cast<int>(nbKeys) );
|
||||
|
||||
// If no duplicates, then try next one.
|
||||
if( nbKeys == 1 ) continue ;
|
||||
|
||||
++nbDupl ;
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("%d: Name %s %d occurrences", nbDupl, itH->first.c_str(), nbKeys );
|
||||
LOG_INFO("%d: Name %s %d occurrences",
|
||||
static_cast<int>(nbDupl),
|
||||
itH->first.c_str(),
|
||||
static_cast<int>(nbKeys) );
|
||||
|
||||
// There should not be many elements, two or three duplicates, maximum five apparently.
|
||||
typedef std::set< std::string > DiffNamesT ;
|
||||
|
@ -678,7 +684,8 @@ public:
|
|||
HashT allNames ;
|
||||
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("Eliminating duplicates out of %d elements",m_catalog.size());
|
||||
LOG_INFO("Eliminating duplicates out of %d elements",
|
||||
static_cast<int>(m_catalog.size()));
|
||||
|
||||
/// First take the names
|
||||
for( IteratorType it = m_catalog.begin(), en = m_catalog.end(); it != en; ++it )
|
||||
|
@ -702,7 +709,9 @@ public:
|
|||
++nbKeys;
|
||||
}
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("Name=%s nb=%d", itH->first.c_str(), nbKeys );
|
||||
LOG_INFO("Name=%s nb=%d",
|
||||
itH->first.c_str(),
|
||||
static_cast<int>(nbKeys) );
|
||||
|
||||
// If no duplicates, then try next one.
|
||||
if( nbKeys == 1 ) continue ;
|
||||
|
@ -710,7 +719,9 @@ public:
|
|||
++nbDupl ;
|
||||
if (bMOREINFO)
|
||||
LOG_INFO("%d: Buoy name %s %d occurrences",
|
||||
nbDupl, itH->first.c_str(), nbKeys );
|
||||
static_cast<int>(nbDupl),
|
||||
itH->first.c_str(),
|
||||
static_cast<int>(nbKeys) );
|
||||
|
||||
// There should not be many elements, two or three duplicates, maximum five apparently.
|
||||
typedef std::set< std::string > DiffNamesT ;
|
||||
|
|
Ładowanie…
Reference in New Issue