diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-07-05 18:06:51 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-07-05 18:06:51 -0700 |
| commit | 74bcca380dd7faa7a629d59e3346506e6a8cca34 (patch) | |
| tree | 246d8c587621fcc753bfafc3f85afdb94e8460c9 /src/mbgl | |
| parent | 5921f692e085bde5d4e8000c33dac29c796acbf0 (diff) | |
| parent | 6ca8cd7e24cf919d5eeb0be49d34a02ba9969ac8 (diff) | |
| download | qtlocation-mapboxgl-74bcca380dd7faa7a629d59e3346506e6a8cca34.tar.gz | |
Merge remote-tracking branch 'origin/tvn-merge-release'
Diffstat (limited to 'src/mbgl')
| -rw-r--r-- | src/mbgl/util/std.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/util/std.hpp b/src/mbgl/util/std.hpp index 974e21329c..1db20e09e5 100644 --- a/src/mbgl/util/std.hpp +++ b/src/mbgl/util/std.hpp @@ -8,10 +8,10 @@ namespace mbgl { namespace util { template <typename Container, typename ForwardIterator, typename Predicate> -void erase_if(Container &container, ForwardIterator it, const ForwardIterator end, Predicate pred) { - while (it != end) { +void erase_if(Container &container, ForwardIterator it, Predicate pred) { + while (it != container.end()) { if (pred(*it)) { - container.erase(it++); + it = container.erase(it); } else { ++it; } @@ -20,7 +20,7 @@ void erase_if(Container &container, ForwardIterator it, const ForwardIterator en template <typename Container, typename Predicate> void erase_if(Container &container, Predicate pred) { - erase_if(container, container.begin(), container.end(), pred); + erase_if(container, container.begin(), pred); } } // namespace util |