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
path: root/map
diff options
context:
space:
mode:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2018-02-14 14:12:16 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2018-02-15 11:12:21 +0300
commit6616762990c66b10b49881bf1e7b16dbcc5c3082 (patch)
tree6f23132e63a683d1250aba7307bbaf56d0270f7f /map
parent6f49ea9388fd5bc9c1637dd56ee426799c0a3b7d (diff)
Changed timestamp-methods signature
Diffstat (limited to 'map')
-rw-r--r--map/bookmark_manager.cpp4
-rw-r--r--map/bookmark_manager.hpp2
-rw-r--r--map/cloud.cpp2
-rw-r--r--map/cloud.hpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 06cccd2905..4a6b5c494e 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -1185,9 +1185,9 @@ bool BookmarkManager::IsCloudEnabled() const
return m_bookmarkCloud.GetState() == Cloud::State::Enabled;
}
-uint64_t BookmarkManager::GetLastSynchronizationTimestamp() const
+uint64_t BookmarkManager::GetLastSynchronizationTimestampInMs() const
{
- return m_bookmarkCloud.GetLastSynchronizationTimestamp();
+ return m_bookmarkCloud.GetLastSynchronizationTimestampInMs();
}
std::unique_ptr<User::Subscriber> BookmarkManager::GetUserSubscriber()
diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp
index 6d0b3f6b58..720939673c 100644
--- a/map/bookmark_manager.hpp
+++ b/map/bookmark_manager.hpp
@@ -187,7 +187,7 @@ public:
void SetCloudEnabled(bool enabled);
bool IsCloudEnabled() const;
- uint64_t GetLastSynchronizationTimestamp() const;
+ uint64_t GetLastSynchronizationTimestampInMs() const;
std::unique_ptr<User::Subscriber> GetUserSubscriber();
void SetInvalidTokenHandler(Cloud::InvalidTokenHandler && onInvalidToken);
diff --git a/map/cloud.cpp b/map/cloud.cpp
index f36a8f3477..64e8ec028c 100644
--- a/map/cloud.cpp
+++ b/map/cloud.cpp
@@ -154,7 +154,7 @@ void Cloud::MarkModified(std::string const & filePath)
MarkModifiedImpl(filePath, false /* checkSize */);
}
-uint64_t Cloud::GetLastSynchronizationTimestamp() const
+uint64_t Cloud::GetLastSynchronizationTimestampInMs() const
{
std::lock_guard<std::mutex> lock(m_mutex);
if (m_state != State::Enabled)
diff --git a/map/cloud.hpp b/map/cloud.hpp
index f65db9319b..3ae781d948 100644
--- a/map/cloud.hpp
+++ b/map/cloud.hpp
@@ -166,7 +166,7 @@ public:
void SetState(State state);
State GetState() const;
// Return timestamp of the last synchronization in milliseconds.
- uint64_t GetLastSynchronizationTimestamp() const;
+ uint64_t GetLastSynchronizationTimestampInMs() const;
void Init(std::vector<std::string> const & filePaths);
void MarkModified(std::string const & filePath);