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

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2012-07-29 22:49:24 -07:00 • committed by Alex Zolotarev
parent dd0e7716de
commit 286d2870d0
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Common/DiskFreeSpace.h
View file

@ -13,7 +13,7 @@ uint64_t FreeDiskSpaceInBytes()
}
else
{
NSLog(@"Error Obtaining Free File System Info: Domain = %@, Code = %@", [error domain], [error code]);
NSLog(@"Error Obtaining Free File System Info: Domain = %@, Code = %d", [error domain], [error code]);
return 0;
}
}

8
map/screen_coverage.cpp
View file

@ -255,15 +255,15 @@ void ScreenCoverage::SetScreen(ScreenBase const & screen)
for (TTileSet::const_iterator it = erasedTiles.begin(); it != erasedTiles.end(); ++it)
{
Tiler::RectInfo ri = (*it)->m_rectInfo;
tileCache->UnlockTile((*it)->m_rectInfo);
Tiler::RectInfo const & ri = (*it)->m_rectInfo;
tileCache->UnlockTile(ri);
/// here we should "unmerge" erasedTiles[i].m_overlay from m_overlay
}
for (TTileSet::const_iterator it = addedTiles.begin(); it != addedTiles.end(); ++it)
{
Tiler::RectInfo ri = (*it)->m_rectInfo;
tileCache->LockTile((*it)->m_rectInfo);
Tiler::RectInfo const & ri = (*it)->m_rectInfo;
tileCache->LockTile(ri);
}
tileCache->Unlock();

2
platform/platform.hpp
View file

@ -135,4 +135,4 @@ public:
string DefaultUrlsJSON() const;
};
extern "C" Platform & GetPlatform();
extern Platform & GetPlatform();

2
platform/platform_ios.mm
View file

@ -198,7 +198,7 @@ void Platform::RunAsync(TFunctor const & fn, Priority p)
}
////////////////////////////////////////////////////////////////////////
extern "C" Platform & GetPlatform()
extern Platform & GetPlatform()
{
static Platform platform;
return platform;

2
platform/platform_qt.cpp
View file

@ -59,7 +59,7 @@ int Platform::VideoMemoryLimit() const
}
///////////////////////////////////////////////////////////////////////////////
extern "C" Platform & GetPlatform()
extern Platform & GetPlatform()
{
class PlatformQt : public Platform
{

2
tools/mkspecs/iphonedevice-clang/qmake.conf
View file

@ -82,7 +82,7 @@ QMAKE_CFLAGS_X86 += -arch i386
QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
QMAKE_CFLAGS_DWARF2 += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch $$QMAKE_CFLAGS_HIDESYMS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS

2
tools/mkspecs/iphonedevice-g++42/qmake.conf
View file

@ -81,7 +81,7 @@ QMAKE_CFLAGS_X86 += -arch i386
QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
QMAKE_CFLAGS_DWARF2 += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch $$QMAKE_CFLAGS_HIDESYMS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS

2
tools/mkspecs/iphonedevice-llvm/qmake.conf
View file

@ -82,7 +82,7 @@ QMAKE_CFLAGS_X86 += -arch i386
QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
QMAKE_CFLAGS_DWARF2 += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch $$QMAKE_CFLAGS_HIDESYMS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS