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:
authorDmitry Donskoy <donskdmitry@mail.ru>2018-09-27 12:44:48 +0300
committerAleksandr Zatsepin <alexzatsepin@users.noreply.github.com>2018-09-27 15:40:37 +0300
commit2c67f6f235eb6e683fbb783118e5c824683c7deb (patch)
tree7f37c0f9e3ec4ba026ac0b6c1bc54ef249f492e3
parent4c70b50a3b2f9c77e0b245c8d68f510519bc1ab9 (diff)
[android] Changed imports order, changed signature method https://github.com/yoksnod/omim/pull/5#discussion_r220500656 https://github.com/yoksnod/omim/pull/5#discussion_r220559385
-rw-r--r--android/jni/com/mapswithme/maps/Framework.cpp4
-rw-r--r--map/framework.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 1af68d62e6..2460e4f0e7 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -669,6 +669,7 @@ void Framework::LogLocalAdsEvent(local_ads::EventType type, double lat, double l
m_work.GetDrawScale(), local_ads::Clock::now(), lat, lon, accuracy);
m_work.GetLocalAdsManager().GetStatistics().RegisterEvent(std::move(event));
}
+
void Framework::DisableAdProvider(ads::Banner::Type const type, ads::Banner::Place const place)
{
m_work.DisableAdProvider(type, place);
@@ -1140,8 +1141,7 @@ Java_com_mapswithme_maps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jcl
}
JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_Framework_nativeDisableAdProvider(JNIEnv * env,
- jclass, jint type,
+Java_com_mapswithme_maps_Framework_nativeDisableAdProvider(JNIEnv * env, jclass, jint type,
jint place)
{
auto const & bannerType = static_cast<ads::Banner::Type>(type);
diff --git a/map/framework.hpp b/map/framework.hpp
index 44b28e56c1..e28da035a5 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -53,11 +53,11 @@
#include "tracking/reporter.hpp"
+#include "partners_api/banner.hpp"
#include "partners_api/booking_api.hpp"
#include "partners_api/locals_api.hpp"
#include "partners_api/taxi_engine.hpp"
#include "partners_api/viator_api.hpp"
-#include "partners_api/banner.hpp"
#include "metrics/eye_info.hpp"