diff options
author | shalnev <c.shalnev@corp.mail.ru> | 2015-08-07 16:52:01 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:59:46 +0300 |
commit | 73c11ebb148ee0c0819bd40e7dc11068de6ed0fa (patch) | |
tree | bf63d9bf42064faa5aaec557a8c576dcf32689ec /map/framework.cpp | |
parent | 6b2e9a12d7baf4fca7d31670e050148759b8360b (diff) |
Revert "[DO NOT MERGE][routing] Added thread checkers for routing"
Diffstat (limited to 'map/framework.cpp')
-rw-r--r-- | map/framework.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index 592a05f359..b865277175 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2109,8 +2109,6 @@ void Framework::UpdateSavedDataVersion() void Framework::BuildRoute(m2::PointD const & destination, uint32_t timeoutSec) { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("BuildRoute")); - shared_ptr<State> const & state = GetLocationState(); if (!state->IsModeHasPosition()) { @@ -2126,8 +2124,6 @@ void Framework::BuildRoute(m2::PointD const & destination, uint32_t timeoutSec) auto readyCallback = [this](Route const & route, IRouter::ResultCode code) { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("BuildRoute_ReadyCallback")); - vector<storage::TIndex> absentCountries; vector<storage::TIndex> absentRoutingIndexes; if (code == IRouter::NoError) @@ -2163,8 +2159,6 @@ void Framework::BuildRoute(m2::PointD const & destination, uint32_t timeoutSec) void Framework::SetRouter(RouterType type) { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("SetRouter")); - if (m_currentRouterType == type) return; SetRouterImpl(type); @@ -2208,8 +2202,6 @@ void Framework::SetRouterImpl(RouterType type) void Framework::RemoveRoute() { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("RemoveRoute")); - m_bmManager.UserMarksClear(UserMarkContainer::DEBUG_MARK); m_bmManager.ResetRouteTrack(); @@ -2217,8 +2209,6 @@ void Framework::RemoveRoute() void Framework::CloseRouting() { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("CloseRouting")); - GetLocationState()->StopRoutingMode(); m_routingSession.Reset(); RemoveRoute(); @@ -2227,8 +2217,6 @@ void Framework::CloseRouting() void Framework::InsertRoute(Route const & route) { - ASSERT(m_threadChecker.CalledOnOriginalThread(), ("InsertRoute")); - if (route.GetPoly().GetSize() < 2) { LOG(LWARNING, ("Invalid track - only", route.GetPoly().GetSize(), "point(s).")); |