← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to kjs/collector.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Thomas, Jonathan Thomas, Philip Muškovac
  • Date: 2012-05-24 19:52:02 UTC
  • mfrom: (1.14.18)
  • Revision ID: package-import@ubuntu.com-20120524195202-uce4f041j1cp6qz7
Tags: 4:4.8.80a-0ubuntu1
[ Jonathan Thomas ]
* New upstream beta release:
  - Update symbols files for new symbols
* Merge with Debian git, remaining changes:
  - no build-dep on libaspell-dev
  - no build-dep on libfam-dev
  - kdelibs5-data: don't install kspell_aspell.desktop
  - kdelibs5-plugins: don't install  usr/lib/kde4/kspell_aspell.so
  - kdelibs5-dev: don't install preparetips
  - Pass -DKDESU_USE_SUDO_DEFAULT=true to configure
  - dh_fixperms: exclude /usr/lib/kde4/libexec/fileshareset
  - don't apply use_dejavu_as_default_font.diff
  - don't apply kconf_update_migrate_from_kde3_icon_theme.diff
    - kdelibs5-plugins.install:
      drop usr/share/kde4/apps/kconf_update/kdeui.upd
      and migrate_from_kde3_icon_theme
  - don't build depend on libglu1-mesa-dev, not needed due to
    kubuntu_no_direct_gl_usage.diff
  - kdelibs5-plugins: recommend ttf-dejavu-core instead of ttf-dejavu to save
    CD space.

[ Philip Muškovac ]
* Add support to cmake/modules/PythonMacros.cmake for the environment
  variable $PYTHONDONTWRITEBYTECODE to work around the lack of support for
  Python 3 byte code compilation
  - Added in debian/patches/python3-support-bytecode.patch
  - Thanks to Colin Watson for the patch

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
    }