cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

yul-phaser: Use ptrdiff_t for iterator arithmetic

Browse Source
This commit is contained in:
Djordje Mijovic
2020-06-04 17:17:40 +02:00
committed by Kamil Śliwak
parent 92a9f44afa
commit a49a127627
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/yulPhaser/Mutations.cpp
+10 -10
View File
@@ -126,12 +126,12 @@ ChromosomePair fixedPointSwap(
return {
Chromosome(
vector<string>(begin1, begin1 + _crossoverPoint) +
vector<string>(begin2 + _crossoverPoint, end2)
vector<string>(begin1, begin1 + static_cast<ptrdiff_t>(_crossoverPoint)) +
vector<string>(begin2 + static_cast<ptrdiff_t>(_crossoverPoint), end2)
),
Chromosome(
vector<string>(begin2, begin2 + _crossoverPoint) +
vector<string>(begin1 + _crossoverPoint, end1)
vector<string>(begin2, begin2 + static_cast<ptrdiff_t>(_crossoverPoint)) +
vector<string>(begin1 + static_cast<ptrdiff_t>(_crossoverPoint), end1)
),
};
}
@@ -196,8 +196,8 @@ ChromosomePair fixedTwoPointSwap(
assert(_crossoverPoint2 <= _chromosome1.length());
assert(_crossoverPoint2 <= _chromosome2.length());
size_t lowPoint = min(_crossoverPoint1, _crossoverPoint2);
size_t highPoint = max(_crossoverPoint1, _crossoverPoint2);
auto lowPoint = static_cast<ptrdiff_t>(min(_crossoverPoint1, _crossoverPoint2));
auto highPoint = static_cast<ptrdiff_t>(max(_crossoverPoint1, _crossoverPoint2));
auto begin1 = _chromosome1.optimisationSteps().begin();
auto begin2 = _chromosome2.optimisationSteps().begin();
@@ -282,17 +282,17 @@ ChromosomePair uniformSwap(Chromosome const& _chromosome1, Chromosome const& _ch
if (_chromosome1.length() > minLength)
{
if (swapTail)
steps2.insert(steps2.end(), begin1 + minLength, end1);
steps2.insert(steps2.end(), begin1 + static_cast<ptrdiff_t>(minLength), end1);
else
steps1.insert(steps1.end(), begin1 + minLength, end1);
steps1.insert(steps1.end(), begin1 + static_cast<ptrdiff_t>(minLength), end1);
}
if (_chromosome2.length() > minLength)
{
if (swapTail)
steps1.insert(steps1.end(), begin2 + minLength, end2);
steps1.insert(steps1.end(), begin2 + static_cast<ptrdiff_t>(minLength), end2);
else
steps2.insert(steps2.end(), begin2 + minLength, end2);
steps2.insert(steps2.end(), begin2 + static_cast<ptrdiff_t>(minLength), end2);
}
return {Chromosome(steps1), Chromosome(steps2)};