diff options
author | David Shah <dave@ds0.me> | 2020-12-30 20:37:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-30 20:37:07 +0000 |
commit | c6cdf30501dcb2da01361229dd66a05dad73a132 (patch) | |
tree | b91338acfa13c2b53fe48105eb6ffa7639533469 /common | |
parent | 818faa78aaac168742a1f2140de5f4c18c846348 (diff) | |
parent | 60276e34479e61307968c371c4af247bedf30c8f (diff) | |
download | nextpnr-c6cdf30501dcb2da01361229dd66a05dad73a132.tar.gz nextpnr-c6cdf30501dcb2da01361229dd66a05dad73a132.tar.bz2 nextpnr-c6cdf30501dcb2da01361229dd66a05dad73a132.zip |
Merge pull request #548 from per-gron/c++17
C++17 compatibility: Don't use std::random_shuffle
Diffstat (limited to 'common')
-rw-r--r-- | common/nextpnr.h | 14 | ||||
-rw-r--r-- | common/placer_heap.cc | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index f9376fea..5fa946e1 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -631,15 +631,21 @@ struct DeterministicRNG rng64(); } - template <typename T> void shuffle(std::vector<T> &a) + template <typename Iter> void shuffle(const Iter& begin, const Iter& end) { - for (size_t i = 0; i != a.size(); i++) { - size_t j = i + rng(a.size() - i); + size_t size = end - begin; + for (size_t i = 0; i != size; i++) { + size_t j = i + rng(size - i); if (j > i) - std::swap(a[i], a[j]); + std::swap(*(begin + i), *(begin + j)); } } + template <typename T> void shuffle(std::vector<T> &a) + { + shuffle(a.begin(), a.end()); + } + template <typename T> void sorted_shuffle(std::vector<T> &a) { std::sort(a.begin(), a.end()); diff --git a/common/placer_heap.cc b/common/placer_heap.cc index 790c2230..908be49e 100644 --- a/common/placer_heap.cc +++ b/common/placer_heap.cc @@ -530,7 +530,7 @@ class HeAPPlacer available_bels[ctx->getBelType(bel)].push_back(bel); } for (auto &t : available_bels) { - std::random_shuffle(t.second.begin(), t.second.end(), [&](size_t n) { return ctx->rng(int(n)); }); + ctx->shuffle(t.second.begin(), t.second.end()); } for (auto cell : sorted(ctx->cells)) { CellInfo *ci = cell.second; |