diff options
| author | Yuri Gorshenin <y@maps.me> | 2015-07-08 15:00:30 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:54:45 +0300 |
| commit | fda4e3603d8bd3ce40816344afc8f0f88f3e2afd (patch) | |
| tree | a23b273110780feba0ff39684582a01cd8f206fe /map/mwm_tests | |
| parent | a64351d1e62ce58b5a4a8d768a8541c8771f294f (diff) | |
[index, mwm-set] MwmLock -> MwmHandle
Diffstat (limited to 'map/mwm_tests')
| -rw-r--r-- | map/mwm_tests/mwm_index_test.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/map/mwm_tests/mwm_index_test.cpp b/map/mwm_tests/mwm_index_test.cpp index 700d1ddf12..f2ec06de68 100644 --- a/map/mwm_tests/mwm_index_test.cpp +++ b/map/mwm_tests/mwm_index_test.cpp @@ -39,14 +39,13 @@ public: bool RunTest(string const & countryFileName, int lowS, int highS) { model::FeaturesFetcher src; - pair<MwmSet::MwmLock, bool> const p = - src.RegisterMap(platform::LocalCountryFile::MakeForTesting(countryFileName)); - if (!p.second) + auto p = src.RegisterMap(platform::LocalCountryFile::MakeForTesting(countryFileName)); + if (p.second != MwmSet::RegResult::Success) return false; - MwmSet::MwmLock const & lock = p.first; - ASSERT(lock.IsLocked(), ()); + MwmSet::MwmHandle const & handle = p.first; + ASSERT(handle.IsAlive(), ()); - version::Format const version = lock.GetInfo()->m_version.format; + version::Format const version = handle.GetInfo()->m_version.format; if (version == version::unknownFormat) return false; |