← Back to branch summary

~ubuntu-branches/ubuntu/trusty/jellyfish/trusty

« back to all changes in this revision

Viewing changes to jellyfish/direct_indexing_array.hpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2012-05-21 21:56:38 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120521215638-pqynm387yv9cujk1
Tags: 1.1.5-1
http://bugs.debian.org/667214
* New upstream version fixing the FTBFS with gcc-4.7 bug
  Closes: #667214
* debian/patches/fix-unused-but-set-variable.patch: Removed
  because applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
jellyfish/direct_indexing_array.hpp
120
120
      friend class iterator;
121
121
      iterator iterator_all() const { return iterator(this, 0, get_size()); }
122
122
      iterator iterator_slice(size_t slice_number, size_t number_of_slice) const {
123
 
        size_t slice_size = get_size() / number_of_slice;
124
 
        return iterator(this, slice_number * slice_size, (slice_number + 1) * slice_size);
 
123
        std::pair<size_t, size_t> res = slice(slice_number, number_of_slice, get_size());
 
124
        return iterator(this, res.first, res.second);
125
125
      }
126
126
 
127
127
      /**