From e51c501019642544b036981f7928ee496f79d675 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 12 Jan 2012 16:39:37 +0300 Subject: [PATCH] [android] Rolled back MmapReader to FileReader --- coding/zip_reader.hpp | 10 +++++----- platform/platform_android.cpp | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp index c1df9c2551..031b2bd3da 100644 --- a/coding/zip_reader.hpp +++ b/coding/zip_reader.hpp @@ -1,13 +1,13 @@ #pragma once #include "../std/target_os.hpp" -#ifdef OMIM_OS_WINDOWS +//#ifdef OMIM_OS_WINDOWS #include "file_reader.hpp" typedef FileReader BaseZipFileReaderType; -#else - #include "mmap_reader.hpp" - typedef MmapReader BaseZipFileReaderType; -#endif +//#else +// #include "mmap_reader.hpp" +// typedef MmapReader BaseZipFileReaderType; +//#endif #include "../base/exception.hpp" diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 5ce9770280..18d36cf6ae 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -1,6 +1,7 @@ #include "platform.hpp" -#include "../coding/mmap_reader.hpp" +#include "../base/logging.hpp" + #include "../coding/zip_reader.hpp" #include @@ -23,7 +24,7 @@ bool Platform::IsFileExistsByFullPath(string const & filePath) ModelReader * Platform::GetReader(string const & file) const { if (IsFileExistsByFullPath(m_writableDir + file)) - return new MmapReader(ReadPathForFile(file)); + return new BaseZipFileReaderType(ReadPathForFile(file)); else { ASSERT_EQUAL(file.find("assets/"), string::npos, ("Do not use assets/, only file name"));