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:
authorvng <viktor.govako@gmail.com>2015-08-10 20:40:05 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:00:43 +0300
commitb95fc5602c66aaa060b6b40985ebbc71a7cc245a (patch)
tree3213cb4e6bc4c0724bf2ed0d66f46b737b601f0e /map/active_maps_layout.hpp
parent1b27253169d6a1fa61a61f3b638a0bc9c452440f (diff)
[storage] Fixed migrating bug with multiple Index for one mwm local country file.
Diffstat (limited to 'map/active_maps_layout.hpp')
-rw-r--r--map/active_maps_layout.hpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/map/active_maps_layout.hpp b/map/active_maps_layout.hpp
index 81367527ae..5d62bbc2fe 100644
--- a/map/active_maps_layout.hpp
+++ b/map/active_maps_layout.hpp
@@ -4,14 +4,15 @@
#include "storage/storage_defines.hpp"
#include "platform/country_defines.hpp"
-#include "platform/country_file.hpp"
+#include "platform/local_country_file.hpp"
#include "base/buffer_vector.hpp"
+#include "std/function.hpp"
+#include "std/map.hpp"
+#include "std/shared_ptr.hpp"
#include "std/string.hpp"
#include "std/vector.hpp"
-#include "std/map.hpp"
-#include "std/function.hpp"
class Framework;
@@ -99,7 +100,8 @@ private:
Storage const & GetStorage() const;
Storage & GetStorage();
- void Init(vector<platform::CountryFile> const & files);
+ using TLocalFilePtr = shared_ptr<platform::LocalCountryFile>;
+ void Init(vector<TLocalFilePtr> const & files);
void Clear();
void ShowMap(TIndex const & index);