pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Warning and compilation fixes

Browse source
This commit is contained in:
Alex Zolotarev 2014-08-09 19:41:29 +03:00 • committed by Alex Zolotarev
parent 1c8675c1d5
commit bf315c3208
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/jni/nv_time/nv_time.cpp
View file

@ -104,6 +104,7 @@ bool nvValidTimeExtension()
return false;
else
return true;*/
return false;
}
long nvGetSystemTime()

6
base/commands_queue.hpp
View file

@ -83,14 +83,12 @@ namespace core
Chain();
template <typename fun_tt>
Chain(fun_tt fn)
Chain(function_t const & fn)
{
m_fns.push_back(fn);
}
template <typename fun_tt>
Chain & addCommand(fun_tt fn)
Chain & addCommand(function_t const & fn)
{
m_fns.push_back(fn);
return *this;

2
graphics/opengl/opengl_es2.cpp
View file

@ -9,7 +9,7 @@ namespace graphics
#ifndef OMIM_OS_IPHONE
namespace
{
void emptyFlushFn() {}
void OPENGL_CALLING_CONVENTION emptyFlushFn() {}
}
#endif

6
std/target_os.hpp
View file

@ -4,7 +4,9 @@
#define OMIM_OS_ANDROID
#define OMIM_OS_NAME "android"
#define OMIM_OS_MOBILE
#define OMIM_HAS_DEBUG_STL 1
#if __cplusplus <= 199711L
#define OMIM_HAS_DEBUG_STL 1
#endif
#elif defined(_TIZEN_EMULATOR) || defined(_TIZEN_DEVICE)
#define OMIM_OS_TIZEN
@ -49,5 +51,5 @@
#define OMIM_OS_NAME "linux"
#define OMIM_OS_DESKTOP
#define OMIM_HAS_DEBUG_STL 1
#endif