diff options
| -rw-r--r-- | iphone/Common/DiskFreeSpace.h | 2 | ||||
| -rw-r--r-- | map/screen_coverage.cpp | 8 | ||||
| -rw-r--r-- | platform/platform.hpp | 2 | ||||
| -rw-r--r-- | platform/platform_ios.mm | 2 | ||||
| -rw-r--r-- | platform/platform_qt.cpp | 2 | ||||
| -rw-r--r-- | tools/mkspecs/iphonedevice-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | tools/mkspecs/iphonedevice-g++42/qmake.conf | 2 | ||||
| -rw-r--r-- | tools/mkspecs/iphonedevice-llvm/qmake.conf | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/iphone/Common/DiskFreeSpace.h b/iphone/Common/DiskFreeSpace.h index 51c8ff425a..b905aec4d0 100644 --- a/iphone/Common/DiskFreeSpace.h +++ b/iphone/Common/DiskFreeSpace.h @@ -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; } } diff --git a/map/screen_coverage.cpp b/map/screen_coverage.cpp index a039909488..4e2378c741 100644 --- a/map/screen_coverage.cpp +++ b/map/screen_coverage.cpp @@ -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(); diff --git a/platform/platform.hpp b/platform/platform.hpp index ab9e8e98b6..a39d439181 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -135,4 +135,4 @@ public: string DefaultUrlsJSON() const; }; -extern "C" Platform & GetPlatform(); +extern Platform & GetPlatform(); diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index 26edf42938..c6824f29d0 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -198,7 +198,7 @@ void Platform::RunAsync(TFunctor const & fn, Priority p) } //////////////////////////////////////////////////////////////////////// -extern "C" Platform & GetPlatform() +extern Platform & GetPlatform() { static Platform platform; return platform; diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index ad93af0019..5913996265 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -59,7 +59,7 @@ int Platform::VideoMemoryLimit() const } /////////////////////////////////////////////////////////////////////////////// -extern "C" Platform & GetPlatform() +extern Platform & GetPlatform() { class PlatformQt : public Platform { diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index d92fd856b6..6c0da306fb 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -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 diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index 093f4255ca..973b78a3eb 100644 --- a/tools/mkspecs/iphonedevice-g++42/qmake.conf +++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf @@ -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 diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf index bf0f769a31..aa08cb26a5 100644 --- a/tools/mkspecs/iphonedevice-llvm/qmake.conf +++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf @@ -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 |