Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2012-02-27 02:58:32 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:34:43 +0300
commitd10d0e4ada0ab320761f4dc9b42191f889a242a1 (patch)
treeeac72095e9a96dcbdfc7f6ece9ab777032b1268a /coding/zip_reader.hpp
parentfb02b19b4c26d61dcaceb3b7e5daa68a4f24b8f6 (diff)
[android] Used bind for ZipReader::UnzipFile callback impl
Diffstat (limited to 'coding/zip_reader.hpp')
-rw-r--r--coding/zip_reader.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp
index 94c345a002..02a3fb6124 100644
--- a/coding/zip_reader.hpp
+++ b/coding/zip_reader.hpp
@@ -11,6 +11,8 @@
#include "../base/exception.hpp"
+#include "../std/function.hpp"
+
class ZipFileReader : public BaseZipFileReaderType
{
private:
@@ -18,7 +20,7 @@ private:
public:
- typedef void (*ProgressFn)(int, int);
+ typedef function<void(int, int)> ProgressFn;
DECLARE_EXCEPTION(OpenZipException, OpenException);
DECLARE_EXCEPTION(LocateZipException, OpenException);
@@ -31,7 +33,7 @@ public:
/// @warning Can also throw Writer::OpenException and Writer::WriteException
static void UnzipFile(string const & zipContainer, string const & fileInZip,
- string const & outFilePath, ProgressFn progressFn = 0);
+ string const & outFilePath, ProgressFn progressFn = ProgressFn());
static vector<string> FilesList(string const & zipContainer);
/// Quick version without exceptions