diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
commit | 0ce82cdc262fe9c09a1df1f559e1c17abfbbea3d (patch) | |
tree | 56fcdcce7544a32899d0707c2274274df2c37d30 /src/Nerve_GIC/include/gudhi/GIC.h | |
parent | 7cd38c50d3843fd222d4210507bad948afe63912 (diff) | |
parent | 5d5f40493ce60f2a606793645bf713c60fb5284d (diff) |
Merge upstream and resolve conflict
Diffstat (limited to 'src/Nerve_GIC/include/gudhi/GIC.h')
-rw-r--r-- | src/Nerve_GIC/include/gudhi/GIC.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h index b8169c59..a47d6889 100644 --- a/src/Nerve_GIC/include/gudhi/GIC.h +++ b/src/Nerve_GIC/include/gudhi/GIC.h @@ -707,7 +707,7 @@ class Cover_complex { // Sort points according to function values std::vector<int> points(n); for (int i = 0; i < n; i++) points[i] = i; - std::sort(points.begin(), points.end(), [=](const int & p1, const int & p2){return (this->func[p1] < this->func[p2]);}); + std::sort(points.begin(), points.end(), [this](int p1, int p2){return (this->func[p1] < this->func[p2]);}); int id = 0; int pos = 0; |