Skip to content

Commit bda3cc9

Browse files
committed
patch fix for ppl-1.0 source code
1 parent fda870a commit bda3cc9

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

cctools-repo/src/ppl-1.0/src/CO_Tree.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ ::compact_elements_in_the_rightmost_end(dimension_type last_in_subtree,
933933
--subtree_size;
934934
}
935935

936-
ptrdiff_t distance = first_unused_index - indexes;
936+
std::ptrdiff_t distance = first_unused_index - indexes;
937937
PPL_ASSERT(distance >= 0);
938938
return static_cast<dimension_type>(distance);
939939
}

cctools-repo/src/ppl-1.0/src/CO_Tree.defs.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public:
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

@@ -314,7 +314,7 @@ public:
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

cctools-repo/src/ppl-1.0/src/CO_Tree.inlines.hh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CO_Tree::dfs_index(const_iterator itr) const {
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

@@ -40,7 +40,7 @@ CO_Tree::dfs_index(iterator itr) const {
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

@@ -768,7 +768,7 @@ CO_Tree::tree_iterator::follow_left_children_with_value() {
768768
p -= (offset - 1);
769769
while (*p == unused_index)
770770
++p;
771-
ptrdiff_t distance = p - tree.indexes;
771+
std::ptrdiff_t distance = p - tree.indexes;
772772
PPL_ASSERT(distance >= 0);
773773
i = static_cast<dimension_type>(distance);
774774
offset = least_significant_one_mask(i);
@@ -783,7 +783,7 @@ CO_Tree::tree_iterator::follow_right_children_with_value() {
783783
p += (offset - 1);
784784
while (*p == unused_index)
785785
--p;
786-
ptrdiff_t distance = p - tree.indexes;
786+
std::ptrdiff_t distance = p - tree.indexes;
787787
PPL_ASSERT(distance >= 0);
788788
i = static_cast<dimension_type>(distance);
789789
offset = least_significant_one_mask(i);

cctools-repo/src/ppl-1.0/src/Dense_Row.defs.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ public:
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

@@ -474,7 +474,7 @@ class Parma_Polyhedra_Library::Dense_Row::const_iterator {
474474
public:
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

cctools-repo/src/ppl-1.0/src/Linear_Expression.defs.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public:
502502
public:
503503
typedef std::bidirectional_iterator_tag iterator_category;
504504
typedef const Coefficient value_type;
505-
typedef ptrdiff_t difference_type;
505+
typedef std::ptrdiff_t difference_type;
506506
typedef value_type* pointer;
507507
typedef Coefficient_traits::const_reference reference;
508508

cctools-repo/src/ppl-1.0/src/Linear_Expression_Interface.defs.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public:
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

cctools-repo/src/ppl-1.0/src/ppl.hh.dist

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20151,7 +20151,7 @@ public:
2015120151

2015220152
typedef std::bidirectional_iterator_tag iterator_category;
2015320153
typedef Coefficient value_type;
20154-
typedef ptrdiff_t difference_type;
20154+
typedef std::ptrdiff_t difference_type;
2015520155
typedef value_type* pointer;
2015620156
typedef value_type& reference;
2015720157

@@ -20192,7 +20192,7 @@ class Parma_Polyhedra_Library::Dense_Row::const_iterator {
2019220192
public:
2019320193

2019420194
typedef const Coefficient value_type;
20195-
typedef ptrdiff_t difference_type;
20195+
typedef std::ptrdiff_t difference_type;
2019620196
typedef value_type* pointer;
2019720197
typedef Coefficient_traits::const_reference reference;
2019820198

@@ -20974,7 +20974,7 @@ public:
2097420974

2097520975
typedef std::bidirectional_iterator_tag iterator_category;
2097620976
typedef const data_type value_type;
20977-
typedef ptrdiff_t difference_type;
20977+
typedef std::ptrdiff_t difference_type;
2097820978
typedef value_type* pointer;
2097920979
typedef data_type_const_reference reference;
2098020980

@@ -21129,7 +21129,7 @@ public:
2112921129

2113021130
typedef std::bidirectional_iterator_tag iterator_category;
2113121131
typedef data_type value_type;
21132-
typedef ptrdiff_t difference_type;
21132+
typedef std::ptrdiff_t difference_type;
2113321133
typedef value_type* pointer;
2113421134
typedef value_type& reference;
2113521135

@@ -22369,7 +22369,7 @@ CO_Tree::dfs_index(const_iterator itr) const {
2236922369
PPL_ASSERT(itr.current_index != 0);
2237022370
PPL_ASSERT(itr.current_index >= indexes + 1);
2237122371
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
22372-
const ptrdiff_t index = itr.current_index - indexes;
22372+
const std::ptrdiff_t index = itr.current_index - indexes;
2237322373
return static_cast<dimension_type>(index);
2237422374
}
2237522375

@@ -22378,7 +22378,7 @@ CO_Tree::dfs_index(iterator itr) const {
2237822378
PPL_ASSERT(itr.current_index != 0);
2237922379
PPL_ASSERT(itr.current_index >= indexes + 1);
2238022380
PPL_ASSERT(itr.current_index <= indexes + reserved_size);
22381-
const ptrdiff_t index = itr.current_index - indexes;
22381+
const std::ptrdiff_t index = itr.current_index - indexes;
2238222382
return static_cast<dimension_type>(index);
2238322383
}
2238422384

@@ -23106,7 +23106,7 @@ CO_Tree::tree_iterator::follow_left_children_with_value() {
2310623106
p -= (offset - 1);
2310723107
while (*p == unused_index)
2310823108
++p;
23109-
ptrdiff_t distance = p - tree.indexes;
23109+
std::ptrdiff_t distance = p - tree.indexes;
2311023110
PPL_ASSERT(distance >= 0);
2311123111
i = static_cast<dimension_type>(distance);
2311223112
offset = least_significant_one_mask(i);
@@ -23121,7 +23121,7 @@ CO_Tree::tree_iterator::follow_right_children_with_value() {
2312123121
p += (offset - 1);
2312223122
while (*p == unused_index)
2312323123
--p;
23124-
ptrdiff_t distance = p - tree.indexes;
23124+
std::ptrdiff_t distance = p - tree.indexes;
2312523125
PPL_ASSERT(distance >= 0);
2312623126
i = static_cast<dimension_type>(distance);
2312723127
offset = least_significant_one_mask(i);
@@ -24749,7 +24749,7 @@ public:
2474924749
public:
2475024750
typedef std::bidirectional_iterator_tag iterator_category;
2475124751
typedef const Coefficient value_type;
24752-
typedef ptrdiff_t difference_type;
24752+
typedef std::ptrdiff_t difference_type;
2475324753
typedef value_type* pointer;
2475424754
typedef Coefficient_traits::const_reference reference;
2475524755

@@ -27158,7 +27158,7 @@ public:
2715827158
public:
2715927159
typedef std::bidirectional_iterator_tag iterator_category;
2716027160
typedef const Coefficient value_type;
27161-
typedef ptrdiff_t difference_type;
27161+
typedef std::ptrdiff_t difference_type;
2716227162
typedef value_type* pointer;
2716327163
typedef Coefficient_traits::const_reference reference;
2716427164

0 commit comments

Comments
 (0)