From f746c33e6ccda9f34fea8946919418d1acb588f5 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Tue, 10 Jan 2012 20:08:55 +0300 Subject: [PATCH] [win] Fixed ZipReader test --- coding/zip_reader.cpp | 2 +- coding/zip_reader.hpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp index 5d85947341..33d81eed3d 100644 --- a/coding/zip_reader.cpp +++ b/coding/zip_reader.cpp @@ -8,7 +8,7 @@ #include "../3party/zlib/contrib/minizip/unzip.h" ZipFileReader::ZipFileReader(string const & container, string const & file) - : base_type(container) + : BaseZipFileReaderType(container) { unzFile zip = unzOpen64(container.c_str()); if (!zip) diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp index 129ae14234..c1df9c2551 100644 --- a/coding/zip_reader.hpp +++ b/coding/zip_reader.hpp @@ -1,13 +1,18 @@ #pragma once -#include "mmap_reader.hpp" +#include "../std/target_os.hpp" +#ifdef OMIM_OS_WINDOWS + #include "file_reader.hpp" + typedef FileReader BaseZipFileReaderType; +#else + #include "mmap_reader.hpp" + typedef MmapReader BaseZipFileReaderType; +#endif #include "../base/exception.hpp" -class ZipFileReader : public MmapReader +class ZipFileReader : public BaseZipFileReaderType { - typedef MmapReader base_type; - public: DECLARE_EXCEPTION(OpenZipException, OpenException); DECLARE_EXCEPTION(LocateZipException, OpenException);