← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde4libs/precise-updates

« back to all changes in this revision

Viewing changes to kjs/collector.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-06-23 22:35:43 UTC
  • mfrom: (1.14.18)
  • Revision ID: package-import@ubuntu.com-20120623223543-05eqew5wxa89mvve
Tags: 4:4.8.4a-0ubuntu0.1
https://launchpad.net/bugs/1007798
* New upstream release. (LP: #1007798)
* Update symbol files.
* Cherry-pick two commits from the upstream KDE/4.8.x branch so that
  kdelibs works with soprano 2.7.
  - Add Revert_Always_rec-connect_if_forced.diff
  - Add Revert_disconnect_before_re-connecting.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
kjs/collector.cpp
101
101
    size_t m_used;
102
102
    size_t m_capacity;
103
103
 
104
 
    CollectorBlock* operator[](int pos) {
 
104
    CollectorBlock* operator[](size_t pos) {
105
105
        return m_data[pos];
106
106
    }
107
107
 
467
467
      uintptr_t offset = reinterpret_cast<uintptr_t>(x) & BLOCK_OFFSET_MASK;
468
468
      CollectorBlock* blockAddr = reinterpret_cast<CollectorBlock*>(x - offset);
469
469
      for (size_t block = 0; block < usedBlocks; block++) {
470
 
        if ((blocks[block] == blockAddr) & (offset <= lastCellOffset)) {
 
470
        if ((blocks[block] == blockAddr) && (offset <= lastCellOffset)) {
471
471
          if (((CollectorCell *)x)->u.freeCell.zeroIfFree != 0) {
472
472
            JSCell *imp = reinterpret_cast<JSCell *>(x);
473
473
            if (!imp->marked())
515
515
        size_t stackSize;
516
516
        pthread_attr_getstack(&sattr, &stackBase, &stackSize);
517
517
        stackBase = (char *)stackBase + stackSize;      // a matter of interpretation, apparently...
 
518
        pthread_attr_destroy(&sattr);
518
519
        assert(stackBase);
519
520
        stackThread = thread;
520
521
    }