Skip to content

Commit 78de692

Browse files
committed
Patch ppl 1.1
1 parent cb58b67 commit 78de692

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ ::compact_elements_in_the_rightmost_end(dimension_type last_in_subtree,
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
}

cctools-repo/src/ppl-1.1/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.1/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

@@ -772,7 +772,7 @@ CO_Tree::tree_iterator::follow_left_children_with_value() {
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);
@@ -787,7 +787,7 @@ CO_Tree::tree_iterator::follow_right_children_with_value() {
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);

cctools-repo/src/ppl-1.1/src/Congruence_System_defs.hh

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

cctools-repo/src/ppl-1.1/src/Constraint_System_defs.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ for (Constraint_System::const_iterator i = cs.begin(),
609609
class 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&> {
615615
public:

cctools-repo/src/ppl-1.1/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.1/src/Generator_System_defs.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ copy(gs.begin(), gs.end(), ostream_iterator<Generator>(cout, "\n"));
679679
class 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&> {
685685
public:

cctools-repo/src/ppl-1.1/src/Grid_Generator_System_defs.hh

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

cctools-repo/src/ppl-1.1/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

0 commit comments

Comments
 (0)