AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-04-26 02:41:04 +02:00 • committed by Alex Zolotarev
parent 370d442648
commit 64cb846aad
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
console_sloynik/main.cpp
View file

@ -22,7 +22,7 @@ int main(int argc, char * argv [])
if (!FLAGS_lookup.empty())
{
CHECK(m_pDic.get(), ("Dictionary should not be empty."));
for (int i = 0; i < m_pDic->KeyCount(); ++i)
for (sl::Dictionary::Id i = 0; i < m_pDic->KeyCount(); ++i)
{
string key;
m_pDic->KeyById(i, key);

4
generator/feature_sorter.cpp
View file

@ -91,7 +91,7 @@ namespace feature
FeaturesCollector2(string const & fName, feature::DataHeader const & header)
: FeaturesCollector(fName + DATA_FILE_TAG), m_writer(fName), m_header(header)
{
for (int i = 0; i < m_header.GetScalesCount(); ++i)
for (size_t i = 0; i < m_header.GetScalesCount(); ++i)
{
string const postfix = utils::to_string(i);
m_geoFile.push_back(new FileWriter(fName + GEOMETRY_FILE_TAG + postfix));
@ -112,7 +112,7 @@ namespace feature
m_writer.Append(m_datFile.GetName(), DATA_FILE_TAG);
for (int i = 0; i < m_header.GetScalesCount(); ++i)
for (size_t i = 0; i < m_header.GetScalesCount(); ++i)
{
string const geomFile = m_geoFile[i]->GetName();
string const trgFile = m_trgFile[i]->GetName();

2
indexer/data_header.cpp
View file

@ -33,7 +33,7 @@ namespace feature
void DataHeader::SetScales(int * arr)
{
for (int i = 0; i < m_scales.size(); ++i)
for (size_t i = 0; i < m_scales.size(); ++i)
m_scales[i] = static_cast<uint8_t>(arr[i]);
}

2
indexer/feature.cpp
View file

@ -912,7 +912,7 @@ void FeatureType::ReadOffsets(ArrayByteSource & src, uint8_t mask, offsets_t & o
{
ASSERT_GREATER ( mask, 0, () );
int index = 0;
size_t index = 0;
while (mask > 0)
{
ASSERT_LESS ( index, m_header->GetScalesCount(), () );