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

replace call data() from vector. Old compiler does not support

Browse source
This commit is contained in:
ExMix 2013-02-26 10:45:12 +03:00 • committed by Alex Zolotarev
parent 79daf33233
commit cdc56d1fcc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coding/blob_indexer.cpp
View file

@ -55,7 +55,7 @@ void BlobIndexer::FlushChunk()
if (!m_currentChunk.empty())
{
string compressedChunk;
m_compressor(m_currentChunk.data(), m_currentChunk.size(), compressedChunk);
m_compressor(&m_currentChunk[0], m_currentChunk.size(), compressedChunk);
m_writer.Write(compressedChunk.data(), compressedChunk.size());
WriteToSink(m_writer, static_cast<uint32_t>(m_currentChunk.size()));
uint32_t const chunkPrevOffset = (m_chunkOffset.empty() ? 0 : m_chunkOffset.back());

2
search/search_tests/keyword_lang_matcher_test.cpp
View file

@ -41,7 +41,7 @@ KeywordLangMatcher CreateMatcher(string const & query)
prefix = keywords.back();
keywords.pop_back();
}
matcher.SetKeywords(keywords.data(), keywords.size(), prefix);
matcher.SetKeywords(&keywords[0], keywords.size(), prefix);
return matcher;
}

4
search/search_tests/keyword_matcher_test.cpp
View file

@ -54,7 +54,7 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
}
KeywordMatcher matcher;
matcher.SetKeywords(keywords.data(), keywords.size(), prefix);
matcher.SetKeywords(&keywords[0], keywords.size(), prefix);
ScoreT prevScore = ScoreT();
for (size_t i = 0; i < N; ++i)
{
@ -65,7 +65,7 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
// Test that a newly created matcher returns the same result
{
KeywordMatcher freshMatcher;
freshMatcher.SetKeywords(keywords.data(), keywords.size(), prefix);
freshMatcher.SetKeywords(&keywords[0], keywords.size(), prefix);
ScoreT const freshScore = freshMatcher.Score(name);
// TEST_EQUAL(testScore, freshScore, (query, name));
TEST(!(testScore < freshScore), (query, name));