diff options
| author | Maxim Pimenov <m@maps.me> | 2018-09-14 21:08:09 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-18 14:46:56 +0300 |
| commit | 412387c84eefba2ec4c267ee2748bf78f03ce327 (patch) | |
| tree | 8d79b6b480fb91a5458a21aec10ac689de54db9f /tracking | |
| parent | bef147b46fb8fd5160fc8e3b13f3548906ae5ef7 (diff) | |
[base] Replaced the namespace my with base.
Diffstat (limited to 'tracking')
| -rw-r--r-- | tracking/reporter.cpp | 4 | ||||
| -rw-r--r-- | tracking/tracking_tests/protocol_test.cpp | 4 | ||||
| -rw-r--r-- | tracking/tracking_tests/reporter_test.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tracking/reporter.cpp b/tracking/reporter.cpp index 80250be806..f601229efb 100644 --- a/tracking/reporter.cpp +++ b/tracking/reporter.cpp @@ -63,7 +63,7 @@ void Reporter::AddLocation(location::GpsInfo const & info, traffic::SpeedGroup t if (Platform::GetChargingStatus() != Platform::ChargingStatus::Plugged) { - double const currentTime = my::Timer::LocalTime(); + double const currentTime = base::Timer::LocalTime(); if (currentTime < m_lastNotChargingEvent + kNotChargingEventPeriod) return; @@ -135,7 +135,7 @@ bool Reporter::SendPoints() if (m_wasConnected) return true; - double const currentTime = my::Timer::LocalTime(); + double const currentTime = base::Timer::LocalTime(); if (currentTime < m_lastConnectionAttempt + kReconnectDelaySeconds) return false; diff --git a/tracking/tracking_tests/protocol_test.cpp b/tracking/tracking_tests/protocol_test.cpp index 0bd1f76a86..76cf4640b3 100644 --- a/tracking/tracking_tests/protocol_test.cpp +++ b/tracking/tracking_tests/protocol_test.cpp @@ -87,9 +87,9 @@ void DecodeDataPacketVersionTest(Container const & points, Protocol::PacketType { TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp, (points[i].m_timestamp, result[i].m_timestamp)); - TEST(my::AlmostEqualAbsOrRel(points[i].m_latLon.lat, result[i].m_latLon.lat, kEps), + TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lat, result[i].m_latLon.lat, kEps), (points[i].m_latLon.lat, result[i].m_latLon.lat)); - TEST(my::AlmostEqualAbsOrRel(points[i].m_latLon.lon, result[i].m_latLon.lon, kEps), + TEST(base::AlmostEqualAbsOrRel(points[i].m_latLon.lon, result[i].m_latLon.lon, kEps), (points[i].m_latLon.lon, result[i].m_latLon.lon)); } } diff --git a/tracking/tracking_tests/reporter_test.cpp b/tracking/tracking_tests/reporter_test.cpp index eb5256006e..17bff04d7c 100644 --- a/tracking/tracking_tests/reporter_test.cpp +++ b/tracking/tracking_tests/reporter_test.cpp @@ -66,8 +66,8 @@ void TransferLocation(Reporter & reporter, TestSocket & testSocket, double times TEST_EQUAL(points.size(), 1, ()); auto const & point = points[0]; TEST_EQUAL(point.m_timestamp, timestamp, ()); - TEST(my::AlmostEqualAbs(point.m_latLon.lat, latidute, 0.001), ()); - TEST(my::AlmostEqualAbs(point.m_latLon.lon, longtitude, 0.001), ()); + TEST(base::AlmostEqualAbs(point.m_latLon.lat, latidute, 0.001), ()); + TEST(base::AlmostEqualAbs(point.m_latLon.lon, longtitude, 0.001), ()); } } |