kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-05-12 14:10:53 +03:00
parent 39932b1cfb
commit ab78557640
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -244,7 +244,7 @@ jobject ToJavaResult(Result & result, bool isLocalAdsCustomer, bool hasPosition,
env->ReleaseIntArrayElements(ranges.get(), rawArr, 0);
ms::LatLon ll = ms::LatLon::Zero();
std::string distance;
string distance;
if (result.HasPoint())
{
ll = MercatorBounds::ToLatLon(result.GetFeatureCenter());

2
android/jni/com/mapswithme/maps/editor/Editor.cpp
View file

@ -21,7 +21,7 @@
namespace
{
using TCuisine = pair<std::string, std::string>;
using TCuisine = std::pair<std::string, std::string>;
osm::EditableMapObject g_editableMapObject;
jclass g_featureCategoryClazz;

2
android/jni/com/mapswithme/opengl/androidoglcontext.hpp
View file

@ -2,8 +2,8 @@
#include "drape/oglcontext.hpp"
#include <GLES2/gl2.h>
#include <EGL/egl.h>
#include <GLES2/gl2.h>
namespace android
{

4
android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp
View file

@ -7,8 +7,8 @@
#include <algorithm>
#include <EGL/egl.h>
#include <android/native_window_jni.h>
#include <android/native_window.h>
#include <android/native_window_jni.h>
namespace android
{
@ -239,7 +239,7 @@ bool AndroidOGLContextFactory::createWindowSurface()
{
LOG(LDEBUG, ("Backbuffer format: RGB8"));
}
ASSERT(count > 0, ("Didn't std::find any configs."));
ASSERT(count > 0, ("Didn't find any configs."));
std::sort(&configs[0], &configs[count], ConfigComparator(m_display));
for (int i = 0; i < count; ++i)

4
android/jni/com/mapswithme/platform/Platform.hpp
View file

@ -29,8 +29,8 @@ namespace android
bool HasAvailableSpaceForWriting(uint64_t size) const;
void RunOnGuiThread(TFunctor const & fn);
void SendPushWooshTag(std::string const & tag, vector<std::string> const & values);
void SendMarketingEvent(std::string const & tag, map<std::string, std::string> const & params);
void SendPushWooshTag(std::string const & tag, std::vector<std::string> const & values);
void SendMarketingEvent(std::string const & tag, std::map<std::string, std::string> const & params);
static Platform & Instance();