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

Explicit check that only little endian architectures are supported.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-09-04 17:19:44 +03:00 • committed by mpimenov
parent c488f20bba
commit ea3407d1ec
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
coding/endianness.hpp
View file

@ -8,6 +8,10 @@
// #define ENDIAN_IS_BIG
// @TODO(bykoianko) This method returns false since 05.12.2010. That means only little endian
// architecture is supported. Now checks are added to generator and to app that only
// little endian architecture is supported. All the usage of IsBigEndian(), ReverseByteOrder()
// and SwapIfBigEndian() should be removed.
inline bool IsBigEndian()
{
#ifdef ENDIAN_IS_BIG
@ -37,3 +41,10 @@ template <typename T> inline T SwapIfBigEndian(T t)
return t;
#endif
}
inline bool IsLittleEndian()
{
uint16_t const word = 0x0001;
char const * const b = reinterpret_cast<char const * const>(&word);
return b[0] == 0x1;
}

3
generator/generator_tool/generator_tool.cpp
View file

@ -43,6 +43,7 @@
#include "platform/platform.hpp"
#include "coding/endianness.hpp"
#include "coding/file_name_utils.hpp"
#include "coding/transliteration.hpp"
@ -167,6 +168,8 @@ using namespace generator;
int main(int argc, char ** argv)
{
CHECK(IsLittleEndian(), ("Only little endian architecture is supported."));
google::SetUsageMessage(
"Takes OSM XML data from stdin and creates data and index files in several passes.");

5
map/framework.cpp
View file

@ -72,6 +72,7 @@
#include "platform/settings.hpp"
#include "platform/socket.hpp"
#include "coding/endianness.hpp"
#include "coding/file_name_utils.hpp"
#include "coding/multilang_utf8_string.hpp"
#include "coding/transliteration.hpp"
@ -391,6 +392,10 @@ Framework::Framework(FrameworkParams const & params)
, m_purchase(std::make_unique<Purchase>())
, m_tipsApi(static_cast<TipsApi::Delegate &>(*this))
{
CHECK(IsLittleEndian(), ("Only little endian architecture is supported."));
m_startBackgroundTime = my::Timer::LocalTime();
// Editor should be initialized from the main thread to set its ThreadChecker.
// However, search calls editor upon initialization thus setting the lazy editor's ThreadChecker
// to a wrong thread. So editor should be initialiazed before serach.