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

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-03-22 11:26:49 +00:00 • committed by Alex Zolotarev
parent f000196e74
commit 36c7d727f1
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
indexer/index.hpp
View file

@ -227,8 +227,9 @@ private:
// TODO: GetIndex(), Open() and Close() make Index single-threaded!
IndexT * GetIndex(uint32_t scale, m2::RectD const & occlusionRect)
{
if ((m_scaleRange.first <= scale && scale <= m_scaleRange.second) &&
m_Rect.IsIntersect(occlusionRect))
if ((m_scaleRange.first <= static_cast<int>(scale)
&& static_cast<int>(scale) <= m_scaleRange.second)
&& m_Rect.IsIntersect(occlusionRect))
{
Open();
m_QueriesSkipped = 0;
@ -245,7 +246,7 @@ private:
}
}
bool IsMyData(string path) const
bool IsMyData(string const & path) const
{
return m_Path == path;
}

3
iphone/Maps/Settings/SettingsManager.mm
View file

@ -1,5 +1,6 @@
#import "SettingsManager.h"
#import "CountriesViewController.h"
#import "MapViewController.h"
#include "../../../storage/storage.hpp"
@ -98,7 +99,7 @@ using namespace storage;
// options:UIViewAnimationOptionTransitionCurlDown
// completion:nil];
[m_prevController Invalidate];
[(MapViewController *)m_prevController Invalidate];
m_storage = nil;
[m_prevController release];