← Back to branch summary

~ubuntu-branches/debian/jessie/qtdeclarative-opensource-src/jessie

« back to all changes in this revision

Viewing changes to src/3rdparty/masm/yarr/YarrPattern.cpp

  • Committer: Package Import Robot
  • Author(s): Lisandro Damián Nicanor Pérez Meyer
  • Date: 2014-06-05 23:53:56 UTC
  • mfrom: (8.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20140605235356-cf36ioh08oh2oow4
Tags: 5.3.0-5
* Upload to unstable.
* Backport v4_yarr_jit_push_pop_addressTempRegister.patch to fix a bug
  of the JIT compiler in arm. Thanks Scott Kitterman for pointing it out.
* Update symbols files with buildds' logs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/masm/yarr/YarrPattern.cpp
191
191
    void addSorted(Vector<UChar>& matches, UChar ch)
192
192
    {
193
193
        unsigned pos = 0;
194
 
        unsigned range = matches.size();
 
194
        ASSERT(matches.size() <= UINT_MAX);
 
195
        unsigned range = static_cast<unsigned>(matches.size());
195
196
 
196
197
        // binary chop, find position to insert char.
197
198
        while (range) {
216
217
 
217
218
    void addSortedRange(Vector<CharacterRange>& ranges, UChar lo, UChar hi)
218
219
    {
219
 
        unsigned end = ranges.size();
 
220
        ASSERT(ranges.size() <= UINT_MAX);
 
221
        unsigned end = static_cast<unsigned>(ranges.size());
220
222
        
221
223
        // Simple linear scan - I doubt there are that many ranges anyway...
222
224
        // feel free to fix this with something faster (eg binary chop).
427
429
 
428
430
        PatternTerm& lastTerm = m_alternative->lastTerm();
429
431
 
430
 
        unsigned numParenAlternatives = parenthesesDisjunction->m_alternatives.size();
 
432
        ASSERT(parenthesesDisjunction->m_alternatives.size() <= UINT_MAX);
 
433
        unsigned numParenAlternatives = static_cast<unsigned>(parenthesesDisjunction->m_alternatives.size());
431
434
        unsigned numBOLAnchoredAlts = 0;
432
435
 
433
436
        for (unsigned i = 0; i < numParenAlternatives; i++) {