Ticket #16208: ptrdiff_t-ppl-1.1.patch

File ptrdiff_t-ppl-1.1.patch, 6.1 KB (added by Leif Leonhardy, 9 years ago)

For reference / easier reviewing.

  • src/Congruence_System_defs.hh

    old new  
    249249  class const_iterator
    250250    : public std::iterator<std::forward_iterator_tag,
    251251                           Congruence,
    252                            ptrdiff_t,
     252                           std::ptrdiff_t,
    253253                           const Congruence*,
    254254                           const Congruence&> {
    255255  public:
  • src/Constraint_System_defs.hh

    old new  
    609609class Parma_Polyhedra_Library::Constraint_System_const_iterator
    610610  : public std::iterator<std::forward_iterator_tag,
    611611                         Constraint,
    612                          ptrdiff_t,
     612                         std::ptrdiff_t,
    613613                         const Constraint*,
    614614                         const Constraint&> {
    615615public:
  • src/CO_Tree.cc

    old new  
    954954    --subtree_size;
    955955  }
    956956
    957   const ptrdiff_t distance = first_unused_index - indexes;
     957  const std::ptrdiff_t distance = first_unused_index - indexes;
    958958  PPL_ASSERT(distance >= 0);
    959959  return static_cast<dimension_type>(distance);
    960960}
  • src/CO_Tree_defs.hh

    old new  
    159159
    160160    typedef std::bidirectional_iterator_tag iterator_category;
    161161    typedef const data_type value_type;
    162     typedef ptrdiff_t difference_type;
     162    typedef std::ptrdiff_t difference_type;
    163163    typedef value_type* pointer;
    164164    typedef data_type_const_reference reference;
    165165
     
    314314
    315315    typedef std::bidirectional_iterator_tag iterator_category;
    316316    typedef data_type value_type;
    317     typedef ptrdiff_t difference_type;
     317    typedef std::ptrdiff_t difference_type;
    318318    typedef value_type* pointer;
    319319    typedef value_type& reference;
    320320
  • src/CO_Tree_inlines.hh

    old new  
    3131  PPL_ASSERT(itr.current_index != 0);
    3232  PPL_ASSERT(itr.current_index >= indexes + 1);
    3333  PPL_ASSERT(itr.current_index <= indexes + reserved_size);
    34   const ptrdiff_t index = itr.current_index - indexes;
     34  const std::ptrdiff_t index = itr.current_index - indexes;
    3535  return static_cast<dimension_type>(index);
    3636}
    3737
     
    4040  PPL_ASSERT(itr.current_index != 0);
    4141  PPL_ASSERT(itr.current_index >= indexes + 1);
    4242  PPL_ASSERT(itr.current_index <= indexes + reserved_size);
    43   const ptrdiff_t index = itr.current_index - indexes;
     43  const std::ptrdiff_t index = itr.current_index - indexes;
    4444  return static_cast<dimension_type>(index);
    4545}
    4646
     
    772772  p -= (offset - 1);
    773773  while (*p == unused_index)
    774774    ++p;
    775   const ptrdiff_t distance = p - tree.indexes;
     775  const std::ptrdiff_t distance = p - tree.indexes;
    776776  PPL_ASSERT(distance >= 0);
    777777  i = static_cast<dimension_type>(distance);
    778778  offset = least_significant_one_mask(i);
     
    787787  p += (offset - 1);
    788788  while (*p == unused_index)
    789789    --p;
    790   const ptrdiff_t distance = p - tree.indexes;
     790  const std::ptrdiff_t distance = p - tree.indexes;
    791791  PPL_ASSERT(distance >= 0);
    792792  i = static_cast<dimension_type>(distance);
    793793  offset = least_significant_one_mask(i);
  • src/Dense_Row_defs.hh

    old new  
    433433
    434434  typedef std::bidirectional_iterator_tag iterator_category;
    435435  typedef Coefficient value_type;
    436   typedef ptrdiff_t difference_type;
     436  typedef std::ptrdiff_t difference_type;
    437437  typedef value_type* pointer;
    438438  typedef value_type& reference;
    439439
     
    474474public:
    475475
    476476  typedef const Coefficient value_type;
    477   typedef ptrdiff_t difference_type;
     477  typedef std::ptrdiff_t difference_type;
    478478  typedef value_type* pointer;
    479479  typedef Coefficient_traits::const_reference reference;
    480480
  • src/Generator_System_defs.hh

    old new  
    679679class Parma_Polyhedra_Library::Generator_System_const_iterator
    680680  : public std::iterator<std::forward_iterator_tag,
    681681        Generator,
    682         ptrdiff_t,
     682        std::ptrdiff_t,
    683683        const Generator*,
    684684        const Generator&> {
    685685public:
  • src/Grid_Generator_System_defs.hh

    old new  
    277277  class const_iterator
    278278    : public std::iterator<std::forward_iterator_tag,
    279279                           Grid_Generator,
    280                            ptrdiff_t,
     280                           std::ptrdiff_t,
    281281                           const Grid_Generator*,
    282282                           const Grid_Generator&> {
    283283  public:
  • src/Linear_Expression_defs.hh

    old new  
    381381  public:
    382382    typedef std::bidirectional_iterator_tag iterator_category;
    383383    typedef const Coefficient value_type;
    384     typedef ptrdiff_t difference_type;
     384    typedef std::ptrdiff_t difference_type;
    385385    typedef value_type* pointer;
    386386    typedef Coefficient_traits::const_reference reference;
    387387
  • src/Linear_Expression_Interface_defs.hh

    old new  
    6565  public:
    6666    typedef std::bidirectional_iterator_tag iterator_category;
    6767    typedef const Coefficient value_type;
    68     typedef ptrdiff_t difference_type;
     68    typedef std::ptrdiff_t difference_type;
    6969    typedef value_type* pointer;
    7070    typedef Coefficient_traits::const_reference reference;
    7171