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

Merge pull request #515 from ygorshenin/master-android-build-fix

Browse source 
[base, std] Followup fix - replace base/regexp.hpp by base/regex.hpp
This commit is contained in:
Vladimir Byko-Ianko 2015-11-12 14:09:19 +03:00
commit 7cdec88446
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/platform_android.cpp
View file

@ -8,9 +8,10 @@
#include "base/logging.hpp"
#include "base/thread.hpp"
#include "base/regexp.hpp"
#include "base/string_utils.hpp"
#include "std/regex.hpp"
#include <unistd.h> // for sysconf
#include <sys/stat.h>
@ -196,13 +197,12 @@ void Platform::GetFilesByRegExp(string const & directory, string const & regexp,
FilesT fList;
ZipFileReader::FilesList(directory, fList);
regexp::RegExpT exp;
regexp::Create(regexp, exp);
regex exp(regexp);
for (FilesT::iterator it = fList.begin(); it != fList.end(); ++it)
{
string & name = it->first;
if (regexp::IsExist(name, exp))
if (regex_search(name.begin(), name.end(), exp))
{
// Remove assets/ prefix - clean files are needed for fonts white/blacklisting logic
size_t const ASSETS_LENGTH = 7;